source: diffs/qpdfview_0.4.7_GA.diff

Last change on this file was 152, checked in by Silvan Scherrer, 12 years ago

psi and qpdfview update

File size: 20.4 KB
RevLine 
[152]1diff -Naur -x qpdfview.desktop E:\trees\qpdfview\trunk\..\vendor\current/build_os2.cmd E:\trees\qpdfview\trunk/build_os2.cmd
2--- E:\trees\qpdfview\trunk\..\vendor\current/build_os2.cmd 1970-01-01 01:00:00.000000000 +0100
3+++ E:\trees\qpdfview\trunk/build_os2.cmd 2013-12-03 14:46:24.000000000 +0100
4@@ -0,0 +1,359 @@
5+/* qpdfview Build Script */
6+/* version history */
7+/* version 0.1.0 from 25.03.2013 Silvan (first edition) */
8+/* version 0.1.1 from 25.04.2013 Silvan (new poppler lib) */
9+/* version 0.1.2 from 29.05.2013 Silvan (application version from qpdfview.pri) */
10+/* version 0.1.3 from 17.06.2013 Silvan (added .ps support) */
11+/* version 0.1.4 from 08.08.2013 Silvan (new poppler lib) */
12+/* version 0.1.5 from 20.08.2013 Silvan (added diff option) */
13+/* version 0.1.6 from 15.10.2013 Silvan (copy all help*.html) */
14+/* version 0.2.0 from 16.10.2013 Silvan (get some info form qpdfview_os2.pri) */
15+/* version 0.2.1 from 03.12.2013 Silvan (help files now in help dir) */
16+
17+/* init the version string (don't forget to change) */
18+version = "0.2.1"
19+version_date = "03.12.2013"
20+'@echo off'
21+
22+parse arg command option
23+parse source . . scriptFile
24+
25+/* init the required vars */
26+qRC = 0
27+mRC = 0
28+buildDir = strip(directory(),'T','\') /* Make sure we have no trailing backslash */
29+sourceDir = FixDir(filespec('D', scriptFile) || filespec('P', scriptFile))
30+vendorDir = sourceDir || '\..\vendor\current'
31+diffDir = sourceDir || '\..\'
32+srcDir = sourceDir
33+OS2Dir = sourceDir
34+installDir = buildDir || '\install'
35+installDirT= installDir || '\data'
36+qErrorFile = buildDir||'\qmake.err'
37+qOutFile = buildDir||'\qmake.out'
38+mErrorFile = buildDir||'\make.err'
39+mOutFile = buildDir||'\make.out'
40+
41+/* get the Qpdfview version */
42+Qpdfview_version = '0.0.0'
43+Qpdfview_build = ' '
44+call version
45+internal_build = translate(Qpdfview_version, '_', '.')
46+
47+/* get some info from qpdfview_os2.pri */
48+popplerDir = ' '
49+psDir = ' '
50+djvuDir = ' '
51+tiffDir = ' '
52+call getpri
53+
54+title = "Qpdfview for eCS (OS/2) build script v" || version || " from " || version_date
55+say title
56+say
57+say "Build directory :" buildDir
58+say "Source directory :" sourceDir
59+say
60+say "Qpdfview version :" Qpdfview_version
61+say " build :" Qpdfview_build
62+say
63+say "Using poppler from:" popplerDir
64+say " djvu from :" djvuDir
65+say " ps from :" psDir
66+say " tiff from :" tiffDir
67+say
68+
69+/* translate command to all upercase */
70+command = translate(command)
71+
72+if command = "" then signal help
73+
74+
75+if command = "INSTALL" then do
76+ if option \== "" then do
77+ Qpdfview_build = option
78+ end
79+ select
80+ when Qpdfview_build \== "" then do
81+ zipFile = installDir || '\qpdfview-' || internal_build || '-' || Qpdfview_build || '.zip'
82+ end
83+ otherwise do
84+ signal help
85+ end
86+ end
87+end
88+
89+/* now we translate also the option */
90+option = translate(option)
91+
92+if sourceDir \== buildDir then do
93+ say "Shadow build in progress ..."
94+ say
95+end
96+
97+say "Executing command: "command option
98+
99+select
100+ when command = "MAKE" & option = "CLEAN" then do
101+
102+ say "cleaning the tree"
103+ call make 'distclean'
104+
105+ say "please execute this script again with 'make' to build Qpdfview"
106+
107+ end
108+ when command = "MAKE" then do
109+
110+ say "creating Qpdfview makefile"
111+ call qmake
112+
113+ if qRC = 0 then do
114+ say "building Qpdfview"
115+ if option = "" then do
116+ call make
117+ end
118+ else do
119+ call make 'debug'
120+ end
121+ end
122+
123+ end
124+
125+ when command = "INSTALL" then do
126+
127+/* first delete everything */
128+ call deleteall
129+
130+/* create the installDir,and the translation subdir */
131+ ok = SysMkDir(installDir)
132+ ok = SysMkDir(installDirT)
133+
134+/* copy the exe */
135+ ok = SysCopyObject(buildDir||'\Qpdfview.exe',installDir)
136+
137+/* copy all dll */
138+ ok = SysFileTree(buildDir||'\*.dll', rm.,'FOS')
139+ do i = 1 to rm.0
140+ ok = SysCopyObject(rm.i, installDir)
141+ end
142+
143+/* copy the readme */
144+ rm.0 = 1
145+ rm.1 = 'install.os2'
146+ do i = 1 to rm.0
147+ cmdtorun = 'sed "s;_VERSION_;' || Qpdfview_version || ';g" ' || os2Dir || '\' || rm.i || ' | sed "s;_BUILD_;' || Qpdfview_build || ';g" >' || installDir || '\' || rm.i
148+ address cmd cmdtorun
149+ end
150+
151+/* copy different stuff */
152+ rm.0 = 5
153+ rm.1 = 'CHANGES'
154+ frmDir.1 = os2Dir
155+ toDir.1 = installDir
156+ rm.2 = 'help*.html'
157+ frmDir.2 = os2Dir || '\help'
158+ toDir.2 = installDirT
159+ rm.3 = '*.dll'
160+ frmDir.3 = popplerDir || '\poppler\.libs'
161+ toDir.3 = installDir
162+ rm.4 = '*.dll'
163+ frmDir.4 = popplerDir || '\qt4\src\.libs'
164+ toDir.4 = installDir
165+ rm.5 = '*.dll'
166+ frmDir.5 = tiffDir || '\libtiff\.libs'
167+ toDir.5 = installDir
168+ do i = 1 to rm.0
169+ cmdtorun = 'copy ' || frmDir.i || '\' || rm.i || ' ' || toDir.i
170+ address cmd cmdtorun
171+ end
172+
173+/* create the qm files from ts files */
174+ ok = SysFileTree(srcDir||'\translations\*.ts', rm.,'FO')
175+ do i = 1 to rm.0
176+ fileName = filespec('N',rm.i)
177+ fileName = left(fileName,lastpos('.', fileName)-1) || '.qm'
178+ cmdtorun = 'lrelease ' || rm.i || ' -qm ' || installDirT || '\' || fileName
179+ address cmd cmdtorun
180+ end
181+
182+/* zip all dynamic stuff */
183+ ok = directory(installDir)
184+ cmdtorun = 'zip -r ' || zipFile || ' * -x *.zip'
185+ address cmd cmdtorun
186+ ok = directory(buildDir)
187+
188+/* zip all icons */
189+
190+ end
191+
192+ when command = "UNINSTALL" then do
193+
194+ call deleteall
195+
196+ end
197+
198+ when command = "DIFF" then do
199+
200+ address cmd 'diff -Naur ' || vendorDir || ' ' || sourceDir || ' -x qpdfview.desktop >' || diffDir || 'qpdfview_' || Qpdfview_version || '_' || Qpdfview_build || '.diff'
201+
202+ end
203+
204+ otherwise do
205+ say 'Unknown parameter "'command'" - aborting...'
206+ exit 1
207+ end
208+end
209+
210+/* cleanup the mess */
211+error:
212+
213+if qRC = 0 & mRC = 0 then do
214+ ok = SysFileDelete(mOutFile)
215+ ok = SysFileDelete(mErrorFile)
216+ ok = SysFileDelete(qOutFile)
217+ ok = SysFileDelete(qErrorFile)
218+end
219+else do
220+ if mRC <> 0 then do
221+ say "Alarm! Make errors occured! Look at "mOutFile" and "mErrorFile
222+ end
223+ if qRC <> 0 then do
224+ say "Alarm! qMake errors occured! Look at "qOutFile" and "qErrorFile
225+ end
226+end
227+
228+exit 0
229+
230+qmake:
231+ sourceFile = sourceDir || '/qpdfview.pro'
232+ address cmd 'qmake "CONFIG+=without_pkgconfig" "CONFIG+=without_dbus" "CONFIG+=without_magic" ' sourceFile ' 2>'qErrorFile' 1>'qOutFile
233+
234+ qRC = RC
235+ if qRC <> 0 then do
236+ call beep 880, 20
237+ say "Alarm! qmake RC="RC
238+ end
239+return
240+
241+make:
242+ makeparm = arg(1)
243+ address cmd 'make 'makeparm' 2>'mErrorFile' 1>'mOutFile
244+ mRC = RC
245+ if mRC <> 0 then do
246+ call beep 880, 20
247+ say "Alarm! make RC="RC
248+ end
249+return
250+
251+
252+deleteall: /* delete installDir (including subdirs) except zip files */
253+
254+ say "Delete all files except *zip in " installDir
255+ ok = SysFileTree(installDir||'\*', rm.,'FOS')
256+ do i = 1 to rm.0
257+ if translate(right(rm.i, 3)) \== 'ZIP' then do
258+ ok = SysFileDelete(rm.i)
259+ end
260+ end
261+
262+ say "Delete zip file " zipFile
263+ ok = SysFileDelete(zipFile)
264+
265+ say "Removing subdirs from " || installDir
266+ ok = SysFileTree(installDir||'\*', rm.,'OS')
267+ do i = 1 to rm.0
268+ ok = SysRmDir(rm.i)
269+ end
270+
271+ call SysSleep(5)
272+return
273+
274+/**
275+ * Fixes the directory path by a) converting all slashes to back
276+ * slashes and b) ensuring that the trailing slash is present if
277+ * the directory is the root directory, and absent otherwise.
278+ *
279+ * @param dir the directory path
280+ * @param noslash
281+ * optional argument. If 1, the path returned will not have a
282+ * trailing slash anyway. Useful for concatenating it with a
283+ * file name.
284+ */
285+FixDir: procedure expose (Globals)
286+ parse arg dir, noslash
287+ noslash = (noslash = 1)
288+ dir = translate(dir, '\', '/')
289+ if (right(dir, 1) == '\' &,
290+ (noslash | \(length(dir) == 3 & (substr(dir, 2, 1) == ':')))) then
291+ dir = substr(dir, 1, length(dir) - 1)
292+ return dir
293+
294+/**
295+ * reads the version.cpp and gets the Qpdfview version from there
296+ */
297+version: procedure expose Qpdfview_version Qpdfview_build srcDir
298+
299+ QpdfviewVer = ' '
300+ /* Qpdfview Version file */
301+ Version = srcDir || "\qpdfview.pri"
302+
303+ do until lines(Version) = 0
304+ verline = linein(Version)
305+ if substr(Verline,30,19) = "APPLICATION_VERSION" then do
306+ parse var verline . ' '. ' ' QpdfviewVer
307+ end
308+ end
309+
310+ ok = stream(Version,'c','close')
311+ if QpdfviewVer \== ' ' then do
312+ QpdfviewVer = strip(QpdfviewVer,,'"')
313+ parse var QpdfviewVer ver '.' maj '.' min '.' Qpdfview_build
314+ Qpdfview_version = ver || '.'|| maj || '.' || min
315+ end
316+
317+ if Qpdfview_build == '' then do
318+ Qpdfview_build = 'GA'
319+ end
320+
321+ return
322+
323+/**
324+ * reads the qpdfview_os2.pri and some values from there
325+ */
326+getpri: procedure expose popplerDir djvuDir psDir tiffDir srcDir
327+
328+ /* Qpdfview_os2.pri file */
329+ priFile = srcDir || "\qpdfview_os2.pri"
330+
331+ do until lines(priFile) = 0
332+ verline = linein(priFile)
333+ verline = strip(verline,,' ')
334+ if substr(Verline,1,8) = "PDF_ROOT" then do
335+ parse var verline . ' '. ' ' popplerDir
336+ end
337+ if substr(Verline,1,9) = "DJVU_ROOT" then do
338+ parse var verline . ' '. ' ' djvuDir
339+ end
340+ if substr(Verline,1,7) = "PS_ROOT" then do
341+ parse var verline . ' '. ' ' psDir
342+ end
343+ if substr(Verline,1,9) = "TIFF_ROOT" then do
344+ parse var verline . ' '. ' ' tiffDir
345+ end
346+ end
347+
348+ ok = stream(priFile,'c','close')
349+ popplerDir = FixDir(popplerDir)
350+ djvuDir = FixDir(djvuDir)
351+ psDir = FixDir(psDir)
352+ tiffDir = FixDir(tiffDir)
353+ return
354+
355+help:
356+ say "Parameters:"
357+ say " make"
358+ say " make debug"
359+ say " make clean"
360+ say " install build (build overwrites what this script finds)"
361+ say " uninstall"
362+ say " diff (creates a diff from vendor to trunk)"
363+exit 255
364diff -Naur -x qpdfview.desktop E:\trees\qpdfview\trunk\..\vendor\current/install.os2 E:\trees\qpdfview\trunk/install.os2
365--- E:\trees\qpdfview\trunk\..\vendor\current/install.os2 1970-01-01 01:00:00.000000000 +0100
366+++ E:\trees\qpdfview\trunk/install.os2 2013-12-03 15:38:04.000000000 +0100
367@@ -0,0 +1,307 @@
368+Qpdfview _VERSION_ _BUILD_ installation
369+
370+
371+0. CONTENTS OF THIS FILE
372+========================
373+
374+1. INTRODUCTION
375+
376+2. REQUIREMENTS
377+
378+3. INSTALLATION
379+
380+4. BUGREPORTS
381+
382+5. CREDITS
383+
384+6. SUPPORT AND DONATIONS
385+
386+7. HISTORY
387+
388+
389+1. INTRODUCTION
390+===============
391+
392+Welcome to Qpdfview _VERSION_ _BUILD_ port for OS/2 and eComStation.
393+
394+
395+2. REQUIREMENTS
396+===============
397+
398+The following requirements need to be installed.
399+
400+
401+2.1 kLIBC, GCC4Core, Qt4, Zlib, cups
402+------------------------------------
403+
404+The installation of these products can be done either by RPM or ZIP files.
405+
406+2.1.a RPM installation
407+----------------------
408+
409+kLIBC
410+-----
411+
412+ 1. yum install libc
413+
414+GCC4Core
415+--------
416+
417+ 1. yum install libgcc4*
418+ 2. yum install gcc-stack-protector
419+ 3. yum install gcc-stdc++-shared-library
420+ 4. yum install gcc-supc++-shared-library
421+
422+Qt4 dll
423+-------
424+
425+ 1. yum install libqt4
426+
427+Zlib
428+----
429+
430+ 1. yum install zlib
431+
432+Jpeg
433+----
434+
435+ 1. yum install libjpeg
436+
437+djvulibre
438+---------
439+
440+ not available as a rpm at this time of writing
441+
442+cups
443+----
444+
445+ not available as a rpm at this time of writing
446+
447+freetype/fontconfig
448+-------------------
449+
450+ not available as a rpm at this time of writing
451+
452+ghstscript
453+----------
454+
455+ not available as a rpm at this time of writing
456+
457+pthread
458+-------
459+
460+ 1. yum install pthread
461+
462+
463+2.1.b ZIP Installation
464+----------------------
465+
466+kLIBC
467+-----
468+
469+ 1. Download kLIBC 0.6.5 or better (see http://svn.netlabs.org/libc for more
470+ information)
471+ 2. Install the files to your libpath eg x:\ecs\dll
472+
473+GCC4Core
474+--------
475+
476+ 1. Download GCC4Core 1.2.1 or better from http://ftp.netlabs.org/pub/gcc
477+ 2. Install the files to your libpath eg. x:\ecs\dll
478+
479+Qt4 dll
480+-------
481+
482+ 1. Download Qt4 4.7.3 or better (see http://svn.netlabs.org/qt4 for more
483+ information)
484+ 2. Install the files according to the readme
485+
486+Zlib
487+----
488+
489+ 1. Download zlib from http://rpm.netlabs.org/release/00/zip
490+ 2. Unpack and install z.dll to your libpath eg. x:\ecs\dll
491+
492+Jpeg
493+----
494+
495+ 1. Download jpeg from http://rpm.netlabs.org/release/00/zip
496+ 2. Unpack and install jpeg.dll to your libpath eg. x:\ecs\dll
497+
498+djvulibre
499+---------
500+
501+ 1. Download djvulibre from ftp://ftp.netlabs.org/pub/unixos2/djvulibre-3_5_25.zip
502+ 2. Unpack and install djvu.dll to your libpath eg. x:\ecs\dll
503+
504+cups
505+----
506+
507+ 1. Go to eCUPS wiki to see how to install eCUPS (http://svn.netlabs.org/ecups)
508+ 2. Install eCUPS according to the above wiki
509+
510+freetype/fontconfig
511+-------------------
512+
513+ 1. Download MZFNTCFGFT_RUNTIME as zip or wpi from
514+ ftp://ftp.netlabs.org/incoming/mozilla
515+ 2. Unpack and install it to your libpath eg. x:\ecs\dll
516+
517+ghostscript
518+-----------
519+
520+ 1. Download ghostscript as zip from ftp://ftp.netlabs.org/pub/unixos2/gs871os2.zip
521+ 2. Unpack and install the gsdll23.dll to your libpath eg. x:\ecs\dll
522+ (note this ghostscript it right now not compatible with P. Smedley's port)
523+
524+pthread
525+-------
526+
527+ 1. Download pthread from http://rpm.netlabs.org/release/00/zip
528+ 2. Unpack and install pthr01.dll to your libpath eg. x:\ecs\dll
529+
530+
531+3. INSTALLATION
532+===============
533+
534+To install qpdfview, do the following:
535+
536+ 1. Create a directory for qpdfview.
537+ 2. Extract the qpdfview package to the new directory.
538+ 3. Create a WPS object for qdpfview.exe.
539+ 4. Start qdpfview
540+ 5. Happy using it
541+ 6. If you want to use qpdfview from within a browser, you have to copy
542+ popp*.dll and tiff.dll to the libpath eg. x:\ecs\dll
543+
544+If you have tried to open a file and not all requirements have been there at
545+this try, Qt screwed his plugin cache.
546+To overcome that delete %HOME%/.config/Trolltech.ini. It will be created again
547+when a Qt app starts.
548+
549+Optional: to have special fonts working you need poppler-data pack.
550+
551+ - extract the 4 directories from the package found on http://poppler.freedesktop.org
552+ to your %unixroot%/usr/local/share/poppler or to the dir where qpdfview.exe is installed
553+ - if you also want japanese fonts working, take care that the "Times New Roman WT J" font
554+ is installed. This font is used as a fallback
555+
556+
557+4. BUGREPORTS
558+=============
559+
560+Please create bugreports at http://svn.netlabs.org/qtapps
561+Only bug reports with a reproducable bug are accepted. :-)
562+
563+
564+5. CREDITS
565+==========
566+
567+The port was done by:
568+
569+Silvan Scherrer aka _diver
570+
571+Thanks go to:
572+
573+ * Dmitriy Kuminov
574+
575+They either helped me when I had some nasty questions or did some testing for
576+me.
577+
578+
579+6. SUPPORT AND DONATIONS
580+========================
581+
582+qpdfview port is based on volunteer work. If you would like to support further
583+development, you can do so in one of the following ways:
584+
585+
586+ * Donate to the Qt4 project: see qt.netlabs.org for more information
587+
588+ * Contribute to the project: Besides actual development, this also includes
589+ maintaining the documentation and the project web site as well as help
590+ for users.
591+
592+
593+7. HISTORY
594+==========
595+
596+2013-12-03
597+
598+ * updated to latest qpdfview 0.4.7 source
599+
600+2013-11-29
601+
602+ * updated to latest poppler 0.24.4
603+
604+2013-10-15
605+
606+ * updated to latest qpdfview 0.4.6 source
607+
608+2013-08-14
609+
610+ * updated to latest qpdfview 0.4.4.99 source
611+ * updated to latest poppler 0.24.0
612+
613+2013-06-17
614+
615+ * added .ps and .eps file support
616+
617+2013-05-27
618+
619+ * updated to latest qpdfview 0.4.3 source
620+
621+2013-05-14
622+
623+ * updated to latest qpdfview 0.4.3 beta source
624+
625+2013-04-25
626+
627+ * updated to latest poppler 0.22.3
628+
629+2013-04-19
630+
631+ * updated to latest qpdfview 0.4.2 beta source
632+
633+2013-03-25
634+
635+ * updated to latest qpdfview 0.4.1 source
636+
637+2013-03-20
638+
639+ * updated to latest qpdfview 0.4.1 beta source
640+
641+2013-02-19
642+
643+ * updated to latest qpdfview 0.4.0 source
644+
645+2013-02-12
646+
647+ * updated to latest qpdfview 0.4.0 beta1 source
648+
649+2013-02-06
650+
651+ * updated to latest qpdfview 0.3.7 source
652+
653+2013-01-14
654+
655+ * updated to latest poppler 0.22.0
656+
657+2012-12-13
658+
659+ * updated to latest qpdfview 0.3.7 beta 1 source
660+
661+2012-11-27
662+
663+ * updated to latest qpdfview source
664+
665+2012-10-29
666+
667+ * created install.os2
668+ * updated qpdfview to contain a icon (thx Herwig)
669+
670+2012-10-24
671+
672+ * first public port
673+
674+
675diff -Naur -x qpdfview.desktop E:\trees\qpdfview\trunk\..\vendor\current/qpdfview_os2.pri E:\trees\qpdfview\trunk/qpdfview_os2.pri
676--- E:\trees\qpdfview\trunk\..\vendor\current/qpdfview_os2.pri 1970-01-01 01:00:00.000000000 +0100
677+++ E:\trees\qpdfview\trunk/qpdfview_os2.pri 2013-10-16 14:55:40.000000000 +0200
678@@ -0,0 +1,38 @@
679+# define destdir
680+PLUGIN_DESTDIR = lib
681+
682+# define the djvu part
683+DJVU_ROOT = e:/trees/djvulibre/trunk
684+DJVU_PLUGIN_LIBS += -L$$DJVU_ROOT/libdjvu/.libs
685+DJVU_PLUGIN_LIBS += djvulibre
686+DJVU_PLUGIN_INCLUDEPATH += $$DJVU_ROOT
687+DJVU_PLUGIN = qpdfdjvu
688+DJVU_PLUGIN_NAME = $$DJVU_PLUGIN".dll"
689+
690+# define the poppler part
691+PDF_ROOT = e:/trees/poppler/trunk
692+PDF_PLUGIN_DEFINES += HAS_POPPLER_14 HAS_POPPLER_18 HAS_POPPLER_20 HAS_POPPLER_22 HAS_POPPLER_24
693+PDF_PLUGIN_LIBS += -L$$PDF_ROOT/qt4/src/.libs
694+PDF_PLUGIN_LIBS += popplerqt4
695+PDF_PLUGIN_INCLUDEPATH += $$PDF_ROOT/qt4/src
696+PDF_PLUGIN = qpdfpdf
697+PDF_PLUGIN_NAME = $$PDF_PLUGIN".dll"
698+
699+# define the ps part
700+PS_ROOT = e:/trees/libspectre/trunk
701+PS_PLUGIN_LIBS += -L$$PS_ROOT/libspectre/.libs -Le:/trees/ghostscript/trunk/gs8.71/bin
702+PS_PLUGIN_LIBS += spectre gs
703+PS_PLUGIN_INCLUDEPATH += $$PS_ROOT
704+PS_PLUGIN = qpdfps
705+PS_PLUGIN_NAME = $$PS_PLUGIN".dll"
706+
707+# define the cups part
708+CUPS_LIBS += cups
709+
710+# define the vendor part
711+DEF_FILE_VENDOR = bww bitwise works GmbH
712+DEF_FILE_VERSION = $$APPLICATION_VERSION
713+DEF_FILE_DESCRIPTION = eCS (OS/2) port of qpdfview by Adam Reichold
714+
715+# define tiff, as copied to qpdfview package
716+TIFF_ROOT = e:/trees/libtiff/trunk
717diff -Naur -x qpdfview.desktop E:\trees\qpdfview\trunk\..\vendor\current/synctex/synctex_parser_utils.c E:\trees\qpdfview\trunk/synctex/synctex_parser_utils.c
718--- E:\trees\qpdfview\trunk\..\vendor\current/synctex/synctex_parser_utils.c 2013-03-24 14:30:12.000000000 +0100
719+++ E:\trees\qpdfview\trunk/synctex/synctex_parser_utils.c 2013-03-20 17:08:22.000000000 +0100
720@@ -57,6 +57,10 @@
721 #define SYNCTEX_WINDOWS 1
722 #endif
723
724+#if defined(__OS2__)
725+#define SYNCTEX_OS2 1
726+#endif
727+
728 #ifdef _WIN32_WINNT_WINXP
729 #define SYNCTEX_RECENT_WINDOWS 1
730 #endif
731@@ -121,7 +125,7 @@
732 last_component = next+1;
733 }
734 }
735-# ifdef SYNCTEX_WINDOWS
736+# if defined(SYNCTEX_WINDOWS) || defined (SYNCTEX_OS2)
737 /* On Windows, the '\' is also a path separator. */
738 while((next = strstr(last_component,"\\"))){
739 last_component = next+1;
740@@ -207,7 +211,7 @@
741 if(!strlen(name)) {
742 return synctex_NO;
743 }
744-# if SYNCTEX_WINDOWS
745+# if defined(SYNCTEX_WINDOWS) || defined(SYNCTEX_OS2)
746 if(strlen(name)>2) {
747 return (name[1]==':' && SYNCTEX_IS_PATH_SEPARATOR(name[2]))?synctex_YES:synctex_NO;
748 }
749diff -Naur -x qpdfview.desktop E:\trees\qpdfview\trunk\..\vendor\current/synctex/synctex_parser_utils.h E:\trees\qpdfview\trunk/synctex/synctex_parser_utils.h
750--- E:\trees\qpdfview\trunk\..\vendor\current/synctex/synctex_parser_utils.h 2013-03-24 14:30:12.000000000 +0100
751+++ E:\trees\qpdfview\trunk/synctex/synctex_parser_utils.h 2013-03-20 17:11:20.000000000 +0100
752@@ -64,7 +64,7 @@
753 #define FALSE 0
754 #define TRUE !FALSE
755
756-# if _WIN32
757+# if defined(_WIN32) || defined(__OS2__)
758 # define SYNCTEX_CASE_SENSITIVE_PATH FALSE
759 # define SYNCTEX_IS_PATH_SEPARATOR(c) ('/' == c || '\\' == c)
760 # else
761@@ -72,7 +72,7 @@
762 # define SYNCTEX_IS_PATH_SEPARATOR(c) ('/' == c)
763 # endif
764
765-# if _WIN32
766+# if defined(_WIN32) || defined(__OS2__)
767 # define SYNCTEX_IS_DOT(c) ('.' == c)
768 # else
769 # define SYNCTEX_IS_DOT(c) ('.' == c)
Note: See TracBrowser for help on using the repository browser.