From 18bbe8916499c9b308bf918e218fe7f54430d2b3 Mon Sep 17 00:00:00 2001 From: Mario Fetka Date: Thu, 19 Jan 2012 22:35:31 +0100 Subject: [PATCH] msi based Planmaker viewer --- CLIENT_DATA/associate.cmd | 14 - CLIENT_DATA/delsub32.ins | 8 +- CLIENT_DATA/setup32.ins | 39 +-- CLIENT_DATA/uninstall32.ins | 2 +- PMViewerSetup.exe.sha1sum | 1 - PlanMakerViewer2010.msi.sha1sum | 1 + PlanMakerViewer2010.wxs | 368 ++++++++++++++++++++++++++ SoftMaker-Logo.png_medium.png.sha1sum | 1 + build.sh | 15 +- softmaker_office.png.sha1sum | 1 - 10 files changed, 404 insertions(+), 46 deletions(-) delete mode 100644 CLIENT_DATA/associate.cmd delete mode 100644 PMViewerSetup.exe.sha1sum create mode 100644 PlanMakerViewer2010.msi.sha1sum create mode 100644 PlanMakerViewer2010.wxs create mode 100644 SoftMaker-Logo.png_medium.png.sha1sum delete mode 100644 softmaker_office.png.sha1sum diff --git a/CLIENT_DATA/associate.cmd b/CLIENT_DATA/associate.cmd deleted file mode 100644 index 5bf62ea..0000000 --- a/CLIENT_DATA/associate.cmd +++ /dev/null @@ -1,14 +0,0 @@ -@echo off - -SETLOCAL -SET SC=HKLM\SOFTWARE\Classes -SET Extn=pmd pmv xls xlt xlsx xlsm xltx xltm -FOR %%j IN (%Extn%) DO ( - REG ADD %SC%\.%%j /VE /D "PlanMakerViewer.%%j" /F - REG ADD %SC%\PlanMakerViewer.%%j /VE /D "PlanMaker Viewer" /F - REG ADD %SC%\PlanMakerViewer.%%j\DefaultIcon /VE /D "\"%PROGRAMFILES%\SoftMaker Viewer\PlanMaker/PMViewer.exe\"" /F - REG ADD %SC%\PlanMakerViewer.%%j\shell\open\command /VE /D "\"%PROGRAMFILES%\SoftMaker Viewer\PlanMaker/PMViewer.exe\" \"%%1\"" /F - ) -ENDLOCAL - -exit \ No newline at end of file diff --git a/CLIENT_DATA/delsub32.ins b/CLIENT_DATA/delsub32.ins index 669e720..02e2b36 100644 --- a/CLIENT_DATA/delsub32.ins +++ b/CLIENT_DATA/delsub32.ins @@ -4,7 +4,7 @@ ; credits: http://www.opsi.org/credits/ -Set $MsiId$ = '{AC76BA86-7AD7-1031-7B44-AA1000000001}' +Set $MsiId$ = '{E3650D25-6752-4DE1-85DA-72A7BF2E49EE}' Set $UninstallProgram$ = $InstallDir$ + "\uninstall.exe" Message "Uninstalling " + $ProductId$ + " ..." @@ -40,7 +40,7 @@ LinkFolder_uninstall [Winbatch_uninstall_msi] -; msiexec /x $MsiId$ /qb! REBOOT=ReallySuppress +msiexec /x $MsiId$ /qb! REBOOT=ReallySuppress [Files_uninstall] ; Example for recursively deleting the installation directory (don't forget the trailing backslash): @@ -55,8 +55,8 @@ delete -sf "$InstallDir$\" [LinkFolder_uninstall] ; Example of deleting a folder from AllUsers startmenu: ; -set_basefolder common_programs -delete_subfolder SoftMaker +; set_basefolder common_programs +; delete_subfolder $ProductId$ ; ; Example of deleting a shortcut from AllUsers desktop: ; diff --git a/CLIENT_DATA/setup32.ins b/CLIENT_DATA/setup32.ins index d8276f3..257d4d3 100644 --- a/CLIENT_DATA/setup32.ins +++ b/CLIENT_DATA/setup32.ins @@ -26,9 +26,9 @@ Set $LogDir$ = "%SystemDrive%\tmp" ; therefore please: only lower letters, no umlauts, ; no white space use '-' as a seperator Set $ProductId$ = "pmviewer" -Set $MinimumSpace$ = "150 MB" +Set $MinimumSpace$ = "30 MB" ; the path were we find the product after the installation -Set $InstallDir$ = "%ProgramFiles32Dir%\SoftMaker Viewer\PlanMaker\" +Set $InstallDir$ = "%ProgramFiles32Dir%\SoftMaker Viewer\PlanMaker" Set $LicenseRequired$ = "false" Set $LicensePool$ = "p_" + $ProductId$ ; ---------------------------------------------------------------- @@ -60,6 +60,10 @@ else comment "Copy files" Files_install /32Bit + comment "Patching Config Files" + Patches_install "$InstallDir$" + "\SoftMaker\Settings\pmv10config.ini" + + comment "Patch Registry" Registry_install /32Bit @@ -83,14 +87,17 @@ endif ; ; === MSI package ======================================================================================= ; You may use the parameter PIDKEY=$Licensekey$ -;msiexec /i "%ScriptPath%\X86FILE" /l* "$LogDir$\$ProductId$.install_log.txt" /qb! ALLUSERS=2 REBOOT=ReallySuppress EULA_ACCEPT=YES +msiexec /i "%ScriptPath%\X86FILE" /l* "$LogDir$\$ProductId$.install_log.txt" /qb! ALLUSERS=2 REBOOT=ReallySuppress ; -"%ScriptPath%\associate.cmd" [Files_install] ; Example of recursively copying some files into the installation directory: ; -copy -s "%ScriptPath%\files\*.*" "$InstallDir$" +; copy -s "%ScriptPath%\files\*.*" "$InstallDir$" + +[Patches_install] +set [Ignore] OEMRegisterSkip=-1 + [Registry_install] ; Example of setting some values of an registry key: @@ -108,17 +115,17 @@ copy -s "%ScriptPath%\files\*.*" "$InstallDir$" ; ; Example of creating an shortcut to the installed exe in AllUsers startmenu: ; -set_basefolder common_programs -set_subfolder SoftMaker - -set_link - name: PlanMaker Viewer - target: "$InstallDir$\PMViewer.exe" - parameters: - working_dir: $InstallDir$ - icon_file: "$InstallDir$\PMViewer.exe" - icon_index: 1 -end_link +; set_basefolder common_programs +; set_subfolder $ProductId$ +; +; set_link +; name: $ProductId$ +; target: +; parameters: +; working_dir: $InstallDir$ +; icon_file: +; icon_index: +; end_link ; ; Example of creating an shortcut to the installed exe on AllUsers desktop: ; diff --git a/CLIENT_DATA/uninstall32.ins b/CLIENT_DATA/uninstall32.ins index 86eb3e0..11dffa5 100644 --- a/CLIENT_DATA/uninstall32.ins +++ b/CLIENT_DATA/uninstall32.ins @@ -21,7 +21,7 @@ Set $LogDir$ = "%SystemDrive%\tmp" ; - Please edit the following values - ; ---------------------------------------------------------------- Set $ProductId$ = "pmviewer" -Set $InstallDir$ = "%ProgramFiles32Dir%\SoftMaker Viewer\PlanMaker\" +Set $InstallDir$ = "%ProgramFiles32Dir%\SoftMaker Viewer\PlanMaker" Set $LicenseRequired$ = "false" Set $LicensePool$ = "p_" + $ProductId$ ; ---------------------------------------------------------------- diff --git a/PMViewerSetup.exe.sha1sum b/PMViewerSetup.exe.sha1sum deleted file mode 100644 index e3e7d3f..0000000 --- a/PMViewerSetup.exe.sha1sum +++ /dev/null @@ -1 +0,0 @@ -cda4216d55077b0cc42c9caef3391ac13ad49c0f /usr/portage/distfiles/PMViewerSetup.exe diff --git a/PlanMakerViewer2010.msi.sha1sum b/PlanMakerViewer2010.msi.sha1sum new file mode 100644 index 0000000..71c50bd --- /dev/null +++ b/PlanMakerViewer2010.msi.sha1sum @@ -0,0 +1 @@ +c90a2c27a2ace6670a0acd79a582848f4f5fe825 /usr/portage/distfiles/PlanMakerViewer2010.msi diff --git a/PlanMakerViewer2010.wxs b/PlanMakerViewer2010.wxs new file mode 100644 index 0000000..3e77743 --- /dev/null +++ b/PlanMakerViewer2010.wxs @@ -0,0 +1,368 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/SoftMaker-Logo.png_medium.png.sha1sum b/SoftMaker-Logo.png_medium.png.sha1sum new file mode 100644 index 0000000..11cd2fb --- /dev/null +++ b/SoftMaker-Logo.png_medium.png.sha1sum @@ -0,0 +1 @@ +a7b0f9b48a69b2868382fed95c8afbaa764026b9 /usr/portage/distfiles/SoftMaker-Logo.png_medium.png diff --git a/build.sh b/build.sh index 2b0fad7..bd4fb91 100644 --- a/build.sh +++ b/build.sh @@ -1,13 +1,13 @@ #!/bin/sh PN="pmviewer" VERSION="2010" -RELEASE="5" +RELEASE="6" PRIORITY="0" ADVICE="" -TYPE="restrict" +TYPE="public" # all downloads should not have any traling parameters like ?downlaodid=1234 .....(should rewrite in python) -ICON="http://www.24android.com/de/wp-content/uploads/2010/11/softmaker_office.png" -X86="http://www.softmaker.net/down/PMViewerSetup.exe" +ICON="http://www.android-user.de/var/ezflow_site/storage/images/artikel/exklusiv-vorschau-auf-softmaker-office-fuer-android/softmaker-logo.png/25888-1-ger-DE/SoftMaker-Logo.png_medium.png" +X86="http://internal.graz.disconnected-by-peer.at/Orig/SoftMaker/Viewer/HB/2010/PlanMakerViewer2010.msi" #AMD64="http://downloads.sourceforge.net/sevenzip/7z920-x64.msi" ICONFILE=${ICON##*/} X86FILE=${X86##*/} @@ -56,9 +56,7 @@ unix2dos $OUT/$PN/CLIENT_DATA/* CHECKSUM=`sha1sum /usr/portage/distfiles/$X86FILE` if [ "$CHECKSUM" = "$SHA1SUM" ] then - #cp /usr/portage/distfiles/$X86FILE $OUT/$PN/CLIENT_DATA - mkdir -p $OUT/$PN/CLIENT_DATA/files - 7z x -o$OUT/$PN/CLIENT_DATA/files /usr/portage/distfiles/$X86FILE + cp /usr/portage/distfiles/$X86FILE $OUT/$PN/CLIENT_DATA else echo "The checksums do not match." exit 1 @@ -70,7 +68,6 @@ unix2dos $OUT/$PN/CLIENT_DATA/* else echo "Downloading file" wget -O /usr/portage/distfiles/$X86FILE $X86 - #plowdown -o /usr/portage/distfiles $X86 exit 1 fi @@ -120,5 +117,5 @@ popd mkdir -p /var/tmp/opsi/upload/$TYPE/ cp -afv $OUT/*.opsi /var/tmp/opsi/upload/$TYPE/ -#rm -rf $OUT +rm -rf $OUT diff --git a/softmaker_office.png.sha1sum b/softmaker_office.png.sha1sum deleted file mode 100644 index 44a8bf7..0000000 --- a/softmaker_office.png.sha1sum +++ /dev/null @@ -1 +0,0 @@ -6bf005b745d773d6e50071d3e3ced780d23bd8e0 /usr/portage/distfiles/softmaker_office.png