Changeset 147 for diffs/0.4.6_GA.diff

Timestamp:

Oct 16, 2013, 2:03:55 PM (12 years ago)

Author:

Silvan Scherrer

Message:

changed qpdfview diff

File:

• diffs/0.4.6_GA.diff (modified) (7 diffs)

diffs/0.4.6_GA.diff

@@ -1 +1 @@
 diff -Naur -x qpdfview.desktop E:\trees\qpdfview\trunk\..\vendor\current/build_os2.cmd E:\trees\qpdfview\trunk/build_os2.cmd
 --- E:\trees\qpdfview\trunk\..\vendor\current/build_os2.cmd     1970-01-01 01:00:00.000000000 +0100
-+++ E:\trees\qpdfview\trunk/build_os2.cmd       2013-10-15 17:02:12.000000000 +0200
-@@ -0,0 +1,316 @@
++++ E:\trees\qpdfview\trunk/build_os2.cmd       2013-10-16 14:54:30.000000000 +0200
+@@ -0,0 +1,358 @@
 +/* qpdfview Build Script */
 +/* version history */
@@ -12 +12 @@
 +/* version 0.1.5 from 20.08.2013 Silvan (added diff option) */
 +/* version 0.1.6 from 15.10.2013 Silvan (copy all help*.html) */
++/* version 0.2.0 from 16.10.2013 Silvan (get some info form qpdfview_os2.pri) */
 +
 +/* init the version string (don't forget to change) */
-+version = "0.1.6"
-+version_date = "15.10.2013"
-+popplerDll = 'popp43.dll'
-+popplerDllQt = 'poppqt44.dll'
-+popplerDir = 'e:\trees\poppler\trunk'
++version = "0.2.0"
++version_date = "16.10.2013"
 +'@echo off'
 +
@@ -46 +44 @@
 +internal_build = translate(Qpdfview_version, '_', '.')
 +
++/* get some info from qpdfview_os2.pri */
++popplerDir = ' '
++psDir = ' '
++djvuDir = ' '
++tiffDir = ' '
++call getpri
++
 +title = "Qpdfview for eCS (OS/2) build script v" || version || " from " || version_date
 +say title
 +say
-+say "Build directory:" buildDir
-+say "Source directory:" sourceDir
++say "Build directory   :" buildDir
++say "Source directory  :" sourceDir
 +say
-+say "Qpdfview version:" Qpdfview_version
-+say "         build:  " Qpdfview_build 
++say "Qpdfview version  :" Qpdfview_version
++say "         build    :" Qpdfview_build 
++say
++say "Using poppler from:" popplerDir
++say "      djvu from   :" djvuDir
++say "      ps from     :" psDir
++say "      tiff from   :" tiffDir
 +say
 +
@@ -146 +156 @@
 +       frmDir.2 = os2Dir || '\miscellaneous'
 +       toDir.2 = installDirT
-+       rm.3 = popplerDll
++       rm.3 = '*.dll'
 +       frmDir.3 = popplerDir || '\poppler\.libs'
 +       toDir.3 = installDir
-+       rm.4 = popplerDllQt
++       rm.4 = '*.dll'
 +       frmDir.4 = popplerDir || '\qt4\src\.libs'
 +       toDir.4 = installDir
-+       rm.5 = 'tiff.dll'
-+       frmDir.5 = 'e:\trees\libtiff\trunk\libtiff\.libs'
++       rm.5 = '*.dll'
++       frmDir.5 = tiffDir || '\libtiff\.libs'
 +       toDir.5 = installDir
 +       do i = 1 to rm.0
@@ -310 +320 @@
 +    return
 +
++/**
++ *  reads the qpdfview_os2.pri and some values from there
++ */ 
++getpri: procedure expose popplerDir djvuDir psDir tiffDir srcDir
++
++    /* Qpdfview_os2.pri file */
++    priFile = srcDir || "\qpdfview_os2.pri"
++
++    do until lines(priFile) = 0
++        verline = linein(priFile)
++        verline = strip(verline,,' ')
++        if substr(Verline,1,8) = "PDF_ROOT" then do
++            parse var verline . ' '. ' ' popplerDir
++        end
++        if substr(Verline,1,9) = "DJVU_ROOT" then do
++            parse var verline . ' '. ' ' djvuDir
++        end
++        if substr(Verline,1,7) = "PS_ROOT" then do
++            parse var verline . ' '. ' ' psDir
++        end
++        if substr(Verline,1,9) = "TIFF_ROOT" then do
++            parse var verline . ' '. ' ' tiffDir
++        end
++    end
++
++    ok = stream(priFile,'c','close')
++    popplerDir = FixDir(popplerDir)
++    djvuDir = FixDir(djvuDir)
++    psDir = FixDir(psDir)
++    tiffDir = FixDir(tiffDir)
++    return
++
 +help:
 +    say "Parameters:"
@@ -628 +670 @@
 diff -Naur -x qpdfview.desktop E:\trees\qpdfview\trunk\..\vendor\current/qpdfview_os2.pri E:\trees\qpdfview\trunk/qpdfview_os2.pri
 --- E:\trees\qpdfview\trunk\..\vendor\current/qpdfview_os2.pri  1970-01-01 01:00:00.000000000 +0100
-+++ E:\trees\qpdfview\trunk/qpdfview_os2.pri    2013-10-07 16:49:08.000000000 +0200
-@@ -0,0 +1,34 @@
++++ E:\trees\qpdfview\trunk/qpdfview_os2.pri    2013-10-16 14:55:40.000000000 +0200
+@@ -0,0 +1,38 @@
 +# define destdir
 +PLUGIN_DESTDIR = lib
 +
 +# define the djvu part
-+DJVU_PLUGIN_LIBS += -Le:/trees/djvulibre/trunk/libdjvu/.libs
++DJVU_ROOT = e:/trees/djvulibre/trunk
++DJVU_PLUGIN_LIBS += -L$$DJVU_ROOT/libdjvu/.libs
 +DJVU_PLUGIN_LIBS += djvulibre
-+DJVU_PLUGIN_INCLUDEPATH += e:/trees/djvulibre/trunk
++DJVU_PLUGIN_INCLUDEPATH += $$DJVU_ROOT
 +DJVU_PLUGIN = qpdfdjvu
 +DJVU_PLUGIN_NAME = $$DJVU_PLUGIN".dll"
 +
 +# define the poppler part
++PDF_ROOT = e:/trees/poppler/trunk
 +PDF_PLUGIN_DEFINES += HAS_POPPLER_14 HAS_POPPLER_18 HAS_POPPLER_20 HAS_POPPLER_22 HAS_POPPLER_24
-+PDF_PLUGIN_LIBS += -Le:/trees/poppler/trunk/qt4/src/.libs
++PDF_PLUGIN_LIBS += -L$$PDF_ROOT/qt4/src/.libs
 +PDF_PLUGIN_LIBS += popplerqt4
-+PDF_PLUGIN_INCLUDEPATH += e:/trees/poppler/trunk/qt4/src
++PDF_PLUGIN_INCLUDEPATH += $$PDF_ROOT/qt4/src
 +PDF_PLUGIN = qpdfpdf
 +PDF_PLUGIN_NAME = $$PDF_PLUGIN".dll"
 +
 +# define the ps part
-+PS_PLUGIN_LIBS += -Le:/trees/libspectre/trunk/libspectre/.libs -Le:/trees/ghostscript/trunk/gs8.71/bin
++PS_ROOT = e:/trees/libspectre/trunk
++PS_PLUGIN_LIBS += -L$$PS_ROOT/libspectre/.libs -Le:/trees/ghostscript/trunk/gs8.71/bin
 +PS_PLUGIN_LIBS += spectre gs
-+PS_PLUGIN_INCLUDEPATH += e:/trees/libspectre/trunk
++PS_PLUGIN_INCLUDEPATH += $$PS_ROOT
 +PS_PLUGIN = qpdfps
 +PS_PLUGIN_NAME = $$PS_PLUGIN".dll"
@@ -663 +708 @@
 +DEF_FILE_DESCRIPTION = eCS (OS/2) port of qpdfview by Adam Reichold
 +
-+
++# define tiff, as copied to qpdfview package
++TIFF_ROOT = e:/trees/libtiff/trunk
 diff -Naur -x qpdfview.desktop E:\trees\qpdfview\trunk\..\vendor\current/synctex/synctex_parser_utils.c E:\trees\qpdfview\trunk/synctex/synctex_parser_utils.c
 --- E:\trees\qpdfview\trunk\..\vendor\current/synctex/synctex_parser_utils.c    2013-03-24 14:30:12.000000000 +0100