source: diffs/qpdfview_0.4.3.diff@ 154

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

Qtapps: added some diffs
File size: 35.5 KB
Line 
1diff -Naur vendor\current/build_os2.cmd trunk/build_os2.cmd
2--- vendor\current/build_os2.cmd 1970-01-01 01:00:00.000000000 +0100
3+++ trunk/build_os2.cmd 2013-05-22 17:19:38.000000000 +0200
4@@ -0,0 +1,296 @@
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+
10+/* init the version string (don't forget to change) */
11+version = "0.1.1"
12+version_date = "25.04.2013"
13+popplerDll = 'popp36.dll'
14+popplerDllQt = 'poppqt44.dll'
15+popplerDir = 'e:\trees\poppler\trunk'
16+'@echo off'
17+
18+parse arg command option
19+parse source . . scriptFile
20+
21+/* init the required vars */
22+qRC = 0
23+mRC = 0
24+buildDir = strip(directory(),'T','\') /* Make sure we have no trailing backslash */
25+sourceDir = FixDir(filespec('D', scriptFile) || filespec('P', scriptFile))
26+srcDir = sourceDir
27+OS2Dir = sourceDir
28+installDir = buildDir || '\install'
29+installDirT= installDir || '\data'
30+qErrorFile = buildDir||'\qmake.err'
31+qOutFile = buildDir||'\qmake.out'
32+mErrorFile = buildDir||'\make.err'
33+mOutFile = buildDir||'\make.out'
34+
35+/* get the Qpdfview version */
36+Qpdfview_version = '0.0.0'
37+Qpdfview_build = ' '
38+call version
39+internal_build = translate(Qpdfview_version, '_', '.')
40+
41+title = "Qpdfview for eCS (OS/2) build script v" || version || " from " || version_date
42+say title
43+say
44+say "Build directory:" buildDir
45+say "Source directory:" sourceDir
46+say
47+say "Qpdfview version:" Qpdfview_version
48+say " build: " Qpdfview_build
49+say
50+
51+/* translate command to all upercase */
52+command = translate(command)
53+
54+if command = "" then signal help
55+
56+if command = "INSTALL" then do
57+ select
58+ when Qpdfview_build \== "" then do
59+ zipFile = installDir || '\qpdfview-' || internal_build || '-' || Qpdfview_build || '.zip'
60+ end
61+ otherwise do
62+ signal help
63+ end
64+ end
65+end
66+
67+/* now we translate also the option */
68+option = translate(option)
69+
70+if sourceDir \== buildDir then do
71+ say "Shadow build in progress ..."
72+ say
73+end
74+
75+select
76+ when command = "MAKE" & option = "CLEAN" then do
77+ say "Executing command: "command option
78+
79+ say "cleaning the tree"
80+ call make 'distclean'
81+
82+ say "please execute this script again with 'make' to build Qpdfview"
83+
84+ end
85+ when command = "MAKE" then do
86+ say "Executing command: "command option
87+
88+ say "creating Qpdfview makefile"
89+ call qmake
90+
91+ if qRC = 0 then do
92+ say "building Qpdfview"
93+ if option = "" then do
94+ call make
95+ end
96+ else do
97+ call make 'debug'
98+ end
99+ end
100+
101+ end
102+
103+ when command = "INSTALL" then do
104+ say "Executing command: "command
105+
106+/* first delete everything */
107+ call deleteall
108+
109+/* create the installDir,and the translation subdir */
110+ ok = SysMkDir(installDir)
111+ ok = SysMkDir(installDirT)
112+
113+/* copy the exe */
114+ ok = SysCopyObject(buildDir||'\Qpdfview.exe',installDir)
115+
116+/* copy all dll */
117+ ok = SysFileTree(buildDir||'\*.dll', rm.,'FOS')
118+ do i = 1 to rm.0
119+ ok = SysCopyObject(rm.i, installDir)
120+ end
121+
122+/* copy the readme */
123+ rm.0 = 1
124+ rm.1 = 'install.os2'
125+ do i = 1 to rm.0
126+ cmdtorun = 'sed "s;_VERSION_;' || Qpdfview_version || ';g" ' || os2Dir || '\' || rm.i || ' | sed "s;_BUILD_;' || Qpdfview_build || ';g" >' || installDir || '\' || rm.i
127+ address cmd cmdtorun
128+ end
129+
130+/* copy different stuff */
131+ rm.0 = 5
132+ rm.1 = 'CHANGES'
133+ frmDir.1 = os2Dir
134+ toDir.1 = installDir
135+ rm.2 = 'help.html'
136+ frmDir.2 = os2Dir || '\miscellaneous'
137+ toDir.2 = installDirT
138+ rm.3 = popplerDll
139+ frmDir.3 = popplerDir || '\poppler\.libs'
140+ toDir.3 = installDir
141+ rm.4 = popplerDllQt
142+ frmDir.4 = popplerDir || '\qt4\src\.libs'
143+ toDir.4 = installDir
144+ rm.5 = 'tiff.dll'
145+ frmDir.5 = 'e:\trees\libtiff\trunk\libtiff\.libs'
146+ toDir.5 = installDir
147+ do i = 1 to rm.0
148+ cmdtorun = 'copy ' || frmDir.i || '\' || rm.i || ' ' || toDir.i
149+ address cmd cmdtorun
150+ end
151+
152+/* create the qm files from ts files */
153+ ok = SysFileTree(srcDir||'\translations\*.ts', rm.,'FO')
154+ do i = 1 to rm.0
155+ fileName = filespec('N',rm.i)
156+ fileName = left(fileName,lastpos('.', fileName)-1) || '.qm'
157+ cmdtorun = 'lrelease ' || rm.i || ' -qm ' || installDirT || '\' || fileName
158+ address cmd cmdtorun
159+ end
160+
161+/* zip all dynamic stuff */
162+ ok = directory(installDir)
163+ cmdtorun = 'zip -r ' || zipFile || ' * -x *.zip'
164+ address cmd cmdtorun
165+ ok = directory(buildDir)
166+
167+/* zip all icons */
168+
169+ end
170+
171+ when command = "UNINSTALL" then do
172+ say "Executing command: "command
173+
174+ call deleteall
175+
176+ end
177+
178+ otherwise do
179+ say 'Unknown parameter "'command'" - aborting...'
180+ exit 1
181+ end
182+end
183+
184+/* cleanup the mess */
185+error:
186+
187+if qRC = 0 & mRC = 0 then do
188+ ok = SysFileDelete(mOutFile)
189+ ok = SysFileDelete(mErrorFile)
190+ ok = SysFileDelete(qOutFile)
191+ ok = SysFileDelete(qErrorFile)
192+end
193+else do
194+ if mRC <> 0 then do
195+ say "Alarm! Make errors occured! Look at "mOutFile" and "mErrorFile
196+ end
197+ if qRC <> 0 then do
198+ say "Alarm! qMake errors occured! Look at "qOutFile" and "qErrorFile
199+ end
200+end
201+
202+exit 0
203+
204+qmake:
205+ sourceFile = sourceDir || '/qpdfview.pro'
206+ address cmd 'qmake "CONFIG+=without_pkgconfig" "CONFIG+=without_ps" "CONFIG+=without_dbus" "CONFIG+=without_magic" ' sourceFile ' 2>'qErrorFile' 1>'qOutFile
207+
208+ qRC = RC
209+ if qRC <> 0 then do
210+ call beep 880, 20
211+ say "Alarm! qmake RC="RC
212+ end
213+return
214+
215+make:
216+ makeparm = arg(1)
217+ address cmd 'make 'makeparm' 2>'mErrorFile' 1>'mOutFile
218+ mRC = RC
219+ if mRC <> 0 then do
220+ call beep 880, 20
221+ say "Alarm! make RC="RC
222+ end
223+return
224+
225+
226+deleteall: /* delete installDir (including subdirs) except zip files */
227+
228+ say "Delete all files except *zip in " installDir
229+ ok = SysFileTree(installDir||'\*', rm.,'FOS')
230+ do i = 1 to rm.0
231+ if translate(right(rm.i, 3)) \== 'ZIP' then do
232+ ok = SysFileDelete(rm.i)
233+ end
234+ end
235+
236+ say "Delete zip file " zipFile
237+ ok = SysFileDelete(zipFile)
238+
239+ say "Removing subdirs from " || installDir
240+ ok = SysFileTree(installDir||'\*', rm.,'OS')
241+ do i = 1 to rm.0
242+ ok = SysRmDir(rm.i)
243+ end
244+
245+ call SysSleep(5)
246+return
247+
248+/**
249+ * Fixes the directory path by a) converting all slashes to back
250+ * slashes and b) ensuring that the trailing slash is present if
251+ * the directory is the root directory, and absent otherwise.
252+ *
253+ * @param dir the directory path
254+ * @param noslash
255+ * optional argument. If 1, the path returned will not have a
256+ * trailing slash anyway. Useful for concatenating it with a
257+ * file name.
258+ */
259+FixDir: procedure expose (Globals)
260+ parse arg dir, noslash
261+ noslash = (noslash = 1)
262+ dir = translate(dir, '\', '/')
263+ if (right(dir, 1) == '\' &,
264+ (noslash | \(length(dir) == 3 & (substr(dir, 2, 1) == ':')))) then
265+ dir = substr(dir, 1, length(dir) - 1)
266+ return dir
267+
268+/**
269+ * reads the version.cpp and gets the Qpdfview version from there
270+ */
271+version: procedure expose Qpdfview_version Qpdfview_build srcDir
272+
273+ QpdfviewVer = ' '
274+ /* Qpdfview Version file */
275+ Version = srcDir || "\os2conf.pri"
276+
277+ do until lines(Version) = 0
278+ verline = linein(Version)
279+ if left(Verline,19) = "APPLICATION_VERSION" then do
280+ parse var verline . ' '. ' ' QpdfviewVer
281+ end
282+ end
283+
284+ ok = stream(Version,'c','close')
285+ if QpdfviewVer \== ' ' then do
286+ QpdfviewVer = strip(QpdfviewVer,,'"')
287+ parse var QpdfviewVer ver '.' maj '.' min '.' Qpdfview_build
288+ Qpdfview_version = ver || '.'|| maj || '.' || min
289+ end
290+
291+ return
292+
293+help:
294+ say "Parameters:"
295+ say " make"
296+ say " make debug"
297+ say " make clean"
298+ say " install version (version should be found by this script)"
299+ say " uninstall"
300+exit 255
301diff -Naur vendor\current/icons/qpdfview.ico trunk/icons/qpdfview.ico
302--- vendor\current/icons/qpdfview.ico 1970-01-01 01:00:00.000000000 +0100
303+++ trunk/icons/qpdfview.ico 2013-05-28 16:32:12.000000000 +0200
304@@ -0,0 +1,23 @@
305+((š
306F šî
307–hž((P€þþþêêêâââæææÞÞÞúúúÖÖÖîîîÎÎκººŠŠŠÚÚÚÒÒÒÂÂÂÊÊʞžžÆÆÆŸŸŸ¢¢¢¶¶¶òòòööö²²²ššš–––ÚºšªªªÒ¶žÆº®ðæގŽŽ’’’ÆŸֶšÆºæÖÊÞÚÚêÞÖîâÚêææâÒÂÖºš®®®êÞÒÚƶҺžÖŸªÒº¢ºŸŸÆž~êîîβšÖƺâÖÊÙʺŸšzƪ’®žîæÚŸ–vº’r¢†ÆŠŠÂž~ÚÖÖÚή²²âÞÞÚʶ¶ººÊ®šÂŸæÚÎÒŸ®Ö²ÖÊŸŸÂÂÆ¢†ÞÚÖÚƲÒ²âÒÆÞÖÒÖƶº’nšžž‚‚‚†††ÊʲҶšÞΟʲžÆ®šÚŸŠÂšzκªÆžzÞÖÎÖº¢ÞÞÚæÞÒàʺƟºâÚÒîâÖÚÊŸâÞÚººŸ¶Šfʲ¢Òƺ®¢šÎ®ŽÎŠζŠ²¶¶ÞªæââîÞÒڎæÖÆÊŠŠÖŸŠêÚΞ‚ÊŸʮ–nnnÖºžÚÖÒ¶®–’’æÚÒÞÒÆÆ¢‚òöö–vÞƲΪҟ¢ÆÞΟ–rº®Æҟª–ÚòîÞÞ⊪ªÊÎκŠ’ÖºŠÎ²–¢–ŽêÞÎÆÆÂÚÆ®Òê溲ªÎº®âζž¢¢Ÿ²¢âÖÆòêâκ¢²ª¢ÂÆÆŸ–z¢žšêæâÒŸŠæÞÖ¶ŽfÚÎÆŸž‚Ú®ÂÂÆæêê²®ªÞÒÎââÞÚÚÖª’†º¶²âʶÆÊÊΪŠÒŸªššžÂÖÆÆ®–ÒÒÎÖªΟ¢ºŽnŸšv–ššÞââÆζֲ–ÖÖҞŠ~Ÿ¶®âææÚÒÆ¢‚Ö¶îööÆæÚƺ²ŸÒÆ®ªªÊ²š²šŽÒîææÞږ‚v¶ž’ŠŠŠÒÎÊ®Š¢š’ŠºŠšº®¢rrrζ¢¢š’ζžÎŸ®âòòÂʶêê檮®ÆªŽ¶²®Êª²²¶ÆÆÊÆŠŽºŽjêêîÆŠ’ŠŸÖÊš~Öî궮ŠÆÞҖ–šâκÞƶή’ŸººÎÊÊÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ
308
309ÿÿÿ
310+
311+
312+
313+
314+
315+
316+
317+
318+
319+Û
320ÿÿÿ
321
322
323
324
325
326
327
328€W
329
330+ÿÿÿ
331
332ÿÿÿÿ 3333ñ²º
333
334
335
336XÿÿÿÿÿÌÆ
337F
338+
339
340
341 Xÿÿÿÿÿÿ
342
343
344++C
345(((
346 Wÿÿÿÿÿÿÿ
347
348
349
350
351+
352ª®s99\5Ø áÿÿÿÿÿÿÿÿ
353bï@?4Z»NQèÿÿÿÿÿÿÿÿ
354
355B@N0°--EP
356_â(ÿÿÿÿÿÿÿÿ
357
358
359
360hõq0/-7jj7P—2JDÿÿÿÿÿÿÿÿ
361
362
363+DG2c0ŒT7LL5K/˜8Sÿÿÿÿÿÿÿÿ
364
365 b<üÁ-)£66†[Eœ^‡`
366
367+ÿÿÿÿÿÿÿÿ
368
369
370loŽ{)$Ie¬hBÏJ«0xê%ÿÿÿÿÿÿÿÿ `a ši';
371
372'$¹ŠuÈ>%ÿÿÿÿÿÿÿÿ Ÿaúwi;
373
374;',f^cq>kÿÿÿÿÿÿÿÿ ž©oU/I,&&e…
3756RK?ÎÄ9µÿÿÿÿÿÿÿÿ ÝÙ³‚=zy,&&,IR[K}=mQÿÿÿÿÿÿÿÿ ŠÊãAnUû'
376
377',$)E?­škþ
378ÿÿÿÿÿÿÿÿ ÷·óýO¯2)
379€
380&$)/8m5ÿÿÿÿÿÿÿÿ žÚÖp Ž@_J$|$fä<ðJvÿÿÿÿÿÿÿÿ GG]àÀO\<‰28=Ã>Bÿÿÿÿÿÿÿÿ "*Z:~%STsnåÍDÉËë ÿÿÿÿÿÿÿÿ "ŒYÇrÕ¢gÜA
381›Ôp4 ÿÿÿÿÿÿÿÿ .ör"4]::ߙ޿ ÿÿÿÿÿÿÿÿ ÂøЈ×Y**"–‘"* ÿÿÿÿÿÿÿÿ .Ÿ’æы* ÿÿÿÿÿÿÿÿ
382ìÓôç ÿÿÿÿÿÿÿÿ ##
383ÿÿÿÿÿÿÿÿ
384ÿÿÿÿÿÿÿÿ
385ÿÿÿÿÿÿÿÿ
386ÿÿÿÿÿÿÿÿ
387ÿÿÿÿÿÿÿÿ
388ÿÿÿÿÿÿÿÿ
389ÿÿÿÿÿÿÿÿ
390ÿÿÿÿÿÿÿÿ
391ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿñÿÿààààààààààààààààààààààààààààààààààààààð?( @€þþþêêêâââæææÞÞÞúúúÖÖÖîîîÎÎκººŠŠŠÚÚÚÒÒÒÂÂÂÊÊʞžžÆÆÆŸŸŸ¢¢¢¶¶¶òòòööö²²²ššš–––ÚºšªªªÒ¶žÆº®ðæގŽŽ’’’ÆŸֶšÆºæÖÊÞÚÚêÞÖîâÚêææâÒÂÖºš®®®êÞÒÚƶҺžÖŸªÒº¢ºŸŸÆž~êîîβšÖƺâÖÊÙʺŸšzƪ’®žîæÚŸ–vº’r¢†ÆŠŠÂž~ÚÖÖÚή²²âÞÞÚʶ¶ººÊ®šÂŸæÚÎÒŸ®Ö²ÖÊŸŸÂÂÆ¢†ÞÚÖÚƲÒ²âÒÆÞÖÒÖƶº’nšžž‚‚‚†††ÊʲҶšÞΟʲžÆ®šÚŸŠÂšzκªÆžzÞÖÎÖº¢ÞÞÚæÞÒàʺƟºâÚÒîâÖÚÊŸâÞÚººŸ¶Šfʲ¢Òƺ®¢šÎ®ŽÎŠζŠ²¶¶ÞªæââîÞÒڎæÖÆÊŠŠÖŸŠêÚΞ‚ÊŸʮ–nnnÖºžÚÖÒ¶®–’’æÚÒÞÒÆÆ¢‚òöö–vÞƲΪҟ¢ÆÞΟ–rº®Æҟª–ÚòîÞÞ⊪ªÊÎκŠ’ÖºŠÎ²–¢–ŽêÞÎÆÆÂÚÆ®Òê溲ªÎº®âζž¢¢Ÿ²¢âÖÆòêâκ¢²ª¢ÂÆÆŸ–z¢žšêæâÒŸŠæÞÖ¶ŽfÚÎÆŸž‚Ú®ÂÂÆæêê²®ªÞÒÎââÞÚÚÖª’†º¶²âʶÆÊÊΪŠÒŸªššžÂÖÆÆ®–ÒÒÎÖªΟ¢ºŽnŸšv–ššÞââÆζֲ–ÖÖҞŠ~Ÿ¶®âææÚÒÆ¢‚Ö¶îööÆæÚƺ²ŸÒÆ®ªªÊ²š²šŽÒîææÞږ‚v¶ž’ŠŠŠÒÎÊ®Š¢š’ŠºŠšº®¢rrrζ¢¢š’ζžÎŸ®âòòÂʶêê檮®ÆªŽ¶²®Êª²²¶ÆÆÊÆŠŽºŽjêêîÆŠ’ŠŸÖÊš~Öî궮ŠÆÞҖ–šâκÞƶή’ŸººÎÊÊÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ
392
393ÿÿÿ
394
395
396
397
398
399
400€W
401
402+ÿÿ
403
404ÿÿÿ 333ñ²
405