source: diffs/0.4.6_GA.diff@ 148

Last change on this file since 148 was 147, checked in by Silvan Scherrer, 12 years ago

changed qpdfview diff

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