From 97b8fbe03c518e0b41c8d2ca39d73e71c6cfb81a Mon Sep 17 00:00:00 2001 From: Peter Singer Date: Thu, 3 Jan 2013 17:31:16 +0100 Subject: [PATCH] Updated version Added option to install version 1.5.1 with (free pdf architect) or version 1.6.1 (without pdf architect) --- CLIENT_DATA/X86/pdfcreator-1.5.1.ini | 15 +++++++++++++++ CLIENT_DATA/X86/pdfcreator-1.6.1.ini | 15 +++++++++++++++ CLIENT_DATA/X86/pdfcreator.ini | 2 -- CLIENT_DATA/delsub32.ins | 1 + CLIENT_DATA/setup32.ins | 23 ++++++++++++++++++++--- OPSI/control | 9 +++++++++ PDFCreator-1.6.1_setup.exe.sha1sum | 1 + builder-product.cfg | 11 ++++++++--- readme.txt | 4 ++++ 9 files changed, 73 insertions(+), 8 deletions(-) create mode 100644 CLIENT_DATA/X86/pdfcreator-1.5.1.ini create mode 100644 CLIENT_DATA/X86/pdfcreator-1.6.1.ini delete mode 100644 CLIENT_DATA/X86/pdfcreator.ini create mode 100644 PDFCreator-1.6.1_setup.exe.sha1sum create mode 100644 readme.txt diff --git a/CLIENT_DATA/X86/pdfcreator-1.5.1.ini b/CLIENT_DATA/X86/pdfcreator-1.5.1.ini new file mode 100644 index 0000000..fd47d05 --- /dev/null +++ b/CLIENT_DATA/X86/pdfcreator-1.5.1.ini @@ -0,0 +1,15 @@ +[Setup] +Lang=german +Group=PDFCreator +NoIcons=0 +SetupType=custom +Components=program,ghostscript,images2pdf,pdfarchitect,comsamples,helpfiles,helpfiles\german,languages,languages\german +Tasks= +Printername=PDFCreator +ServerInstallation=0 +Win9xPrinterdriver=0 +WinNtPrinterdriver=0 +Win2k32bitPrinterdriver=0 +Win2k64bitPrinterdriver=0 +Offer=0 +Toolbar=0 diff --git a/CLIENT_DATA/X86/pdfcreator-1.6.1.ini b/CLIENT_DATA/X86/pdfcreator-1.6.1.ini new file mode 100644 index 0000000..8e19ada --- /dev/null +++ b/CLIENT_DATA/X86/pdfcreator-1.6.1.ini @@ -0,0 +1,15 @@ +[Setup] +Lang=german +Group=PDFCreator +NoIcons=0 +SetupType=custom +Components=program,ghostscript,images2pdf,comsamples,helpfiles,helpfiles\german,languages,languages\german +Tasks= +Printername=PDFCreator +ServerInstallation=0 +Win9xPrinterdriver=0 +WinNtPrinterdriver=0 +Win2k32bitPrinterdriver=0 +Win2k64bitPrinterdriver=0 +Offer=0 +Toolbar=0 diff --git a/CLIENT_DATA/X86/pdfcreator.ini b/CLIENT_DATA/X86/pdfcreator.ini deleted file mode 100644 index ede4e83..0000000 --- a/CLIENT_DATA/X86/pdfcreator.ini +++ /dev/null @@ -1,2 +0,0 @@ -[Setup] -Toolbar=0 diff --git a/CLIENT_DATA/delsub32.ins b/CLIENT_DATA/delsub32.ins index 508959d..ab12c91 100644 --- a/CLIENT_DATA/delsub32.ins +++ b/CLIENT_DATA/delsub32.ins @@ -35,6 +35,7 @@ LinkFolder_uninstall ; Choose one of the following examples as basis for program uninstall ; "$UninstallProgram$" $Uninst_Cmd$ +rundll32 printui.dll,PrintUIEntry /q /dd /m "Visage PDF" [Winbatch_uninstall_msi] msiexec /x $MsiId$ /qb! REBOOT=ReallySuppress diff --git a/CLIENT_DATA/setup32.ins b/CLIENT_DATA/setup32.ins index 42810d8..b10c670 100644 --- a/CLIENT_DATA/setup32.ins +++ b/CLIENT_DATA/setup32.ins @@ -16,6 +16,7 @@ DefVar $ProductId$ DefVar $MinimumSpace$ DefVar $InstallDir$ DefVar $Inst_Cmd$ +DefVar $Inst_Cmd2$ DefVar $ExitCode$ DefVar $LicenseRequired$ DefVar $LicenseKey$ @@ -23,6 +24,9 @@ DefVar $LicensePool$ Set $LogDir$ = "%SystemDrive%\tmp" +DefVar $pp_version$ +Set $pp_version$ = GetProductProperty("pp_version", "1.6.1") + ; The token BUILDER_VARIABLES will be replaced by opsi-builder.sh ; and adds the following variables: ; from builder-product.cfg : all variables definded by attribute WINST[index] @@ -43,7 +47,8 @@ Set $ProductId$ = "pdfforge.pdfcreator" Set $MinimumSpace$ = "50 MB" ; the path were we find the product after the installation Set $InstallDir$ = "%ProgramFiles32Dir%\PDFCreator" -Set $Inst_Cmd$ = '/SILENT /NOCANCEL /LANG=De /NORESTART /LOADINF=%ScriptPath%\X86\pdfcreator.ini' +Set $Inst_Cmd$ = '/SILENT /NOCANCEL /LANG=De /NORESTART /LOADINF=%ScriptPath%\X86\pdfcreator-1.5.1.ini' +Set $Inst_Cmd2$ = '/SILENT /NOCANCEL /LANG=De /NORESTART /LOADINF=%ScriptPath%\X86\pdfcreator-1.6.1.ini' Set $LicenseRequired$ = "false" Set $LicensePool$ = "p_" + $ProductId$ ; ---------------------------------------------------------------- @@ -69,8 +74,17 @@ else endif comment "Start setup program" - Winbatch_install - Sub_check_exitcode + if ($pp_version$ = "1.5.1") + Message "Installing " + $ProductId$ + " 1.5.1 ..." + Winbatch_install + Sub_check_exitcode + endif + + if ($pp_version$ = "1.6.1") + Message "Installing " + $ProductId$ + " 1.6.1 ..." + Winbatch_install_2 + Sub_check_exitcode + endif comment "Copy files" Files_install /32Bit @@ -98,6 +112,9 @@ endif ; "$InstallExe$" $Inst_Cmd$ +[Winbatch_install_2] +"$InstallExe2$" $Inst_Cmd2$ + [Files_install] ; Example of recursively copying some files into the installation directory: ; diff --git a/OPSI/control b/OPSI/control index 9956b66..ae522d9 100644 --- a/OPSI/control +++ b/OPSI/control @@ -35,3 +35,12 @@ action: setup requiredProduct: sereby.aio requiredStatus: installed requirementType: before + +[ProductProperty] +type: unicode +name: pp_version +multivalue: False +editable: False +description: Set version to install (1.5.1 comes with pdf architect) +values: ["1.5.1", "1.6.1"] +default: ["1.6.1"] diff --git a/PDFCreator-1.6.1_setup.exe.sha1sum b/PDFCreator-1.6.1_setup.exe.sha1sum new file mode 100644 index 0000000..9120bef --- /dev/null +++ b/PDFCreator-1.6.1_setup.exe.sha1sum @@ -0,0 +1 @@ +64131ebce68286baaefac74f12628ebfc159b7cb /home/opsiproducts/.opsi-dist-cache/pdfforge.pdfcreator-1.6.1/X86/PDFCreator-1.6.1_setup.exe diff --git a/builder-product.cfg b/builder-product.cfg index f102884..0ea7f6e 100644 --- a/builder-product.cfg +++ b/builder-product.cfg @@ -3,7 +3,7 @@ ############################ VENDOR="pdfforge.org" PN="pdfforge.pdfcreator" -VERSION="1.5.1" +VERSION="1.6.1" RELEASE="1" PRIORITY="0" ADVICE="" @@ -16,10 +16,15 @@ TYPE="public" DL_FILE[0]="PDFCreator.jpg" DL_SOURCE[0]="http://srcweb.net/wp-content/uploads/2011/01/PDFCreator.jpg" -DL_FILE[1]="PDFCreator-${VERSION}_setup.exe" -DL_SOURCE[1]="http://download.pdfforge.org/download/pdfcreator/PDFCreator-stable?download" +DL_FILE[1]="PDFCreator-1.5.1_setup.exe" +DL_SOURCE[1]="http://white.download.pdfforge.org/pdfcreator/1.5.1/PDFCreator-1_5_1_setup.exe" DL_ARCH[1]="X86" DL_WINST_NAME[1]=InstallExe +DL_FILE[2]="PDFCreator-${VERSION}_setup.exe" +DL_SOURCE[2]="http://white.download.pdfforge.org/pdfcreator/1.6.1/PDFCreator-1_6_1_setup.exe" +DL_ARCH[2]="X86" +DL_WINST_NAME[2]=InstallExe2 + # File array index for the image showing while installing the program ICON_DL_INDEX=0 diff --git a/readme.txt b/readme.txt new file mode 100644 index 0000000..0c95edc --- /dev/null +++ b/readme.txt @@ -0,0 +1,4 @@ +Silent installation: +http://www.mockbox.net/configmgr-sccm/190-install-pdf-creator-silently +http://wpkg.org/PDFCreator +http://www.pdfforge.org/content/setup-command-line-parameters