From 5044dd97d28b0372631dd4431afbc0e6856d6cff Mon Sep 17 00:00:00 2001 From: Mario Fetka Date: Mon, 8 Jul 2013 04:44:09 +0200 Subject: [PATCH] Correct The installer --- CLIENT_DATA/setup3264.ins | 8 ++++---- CLIENT_DATA/tightvnc-jviewer.ini | 3 +++ builder-product.cfg | 31 +++++++++++++------------------ builder-targets-cb.sh | 5 ----- 4 files changed, 20 insertions(+), 27 deletions(-) create mode 100644 CLIENT_DATA/tightvnc-jviewer.ini diff --git a/CLIENT_DATA/setup3264.ins b/CLIENT_DATA/setup3264.ins index 581eb04..9afd4a3 100644 --- a/CLIENT_DATA/setup3264.ins +++ b/CLIENT_DATA/setup3264.ins @@ -100,9 +100,9 @@ else endif [Dosbatch_install_32] -copy "%ScriptPath%\ALL\*.* "$InstallDir32$" +copy "$InstallJre$ "$InstallDir32$" copy "%ScriptPath%\tightvnc-jviewer.ini" "$InstallDir32$" -copy "%ScriptPath%\X86\winrun4j\bin\WinRun4J.exe "$InstallDir32$\tightvnc-jviewer.exe" +copy "$Install32Exe$" "$InstallDir32$\tightvnc-jviewer.exe" [Files_install_32] @@ -114,9 +114,9 @@ copy "$IniCfgFile$" "$InstallDir32$" ; copy -s "%ScriptPath%\files\*.*" "$InstallDir32$" [Dosbatch_install_64] -copy "%ScriptPath%\ALL\*.* "$InstallDir64$" +copy "$InstallJre$ "$InstallDir64$" copy "%ScriptPath%\tightvnc-jviewer.ini" "$InstallDir64$" -copy "%ScriptPath%\X86\winrun4j\bin\WinRun4J64.exe "$InstallDir32$\tightvnc-jviewer.exe" +copy "$Install64Exe$" "$InstallDir64$\tightvnc-jviewer.exe" [Files_install_64] ; copy the ini file to the InstallDir diff --git a/CLIENT_DATA/tightvnc-jviewer.ini b/CLIENT_DATA/tightvnc-jviewer.ini new file mode 100644 index 0000000..9046c05 --- /dev/null +++ b/CLIENT_DATA/tightvnc-jviewer.ini @@ -0,0 +1,3 @@ +classpath.1 = *.jar +main.class = com.glavsoft.viewer.Viewer + diff --git a/builder-product.cfg b/builder-product.cfg index 4b76559..adff683 100644 --- a/builder-product.cfg +++ b/builder-product.cfg @@ -26,7 +26,7 @@ DL_EXTRACT_FORMAT[1]="unzip" DL_FILE[2]="winrun4J-${WINRUN4J}.zip" DL_SOURCE[2]="http://sourceforge.net/projects/winrun4j/files/winrun4j/${WINRUN4J}/winrun4J-${WINRUN4J}.zip" -DL_ARCH[2]="X86" +DL_ARCH[2]="ALL" DL_EXTRACT_FORMAT[2]="unzip" # File array index for the image showing while installing the program @@ -44,25 +44,20 @@ ICON_DL_INDEX=0 # results in "%ScriptPath%\X86_64\svcpack\aio-runtimes.exe" # ######################### -WINST_NAME[0]="InstallExe" -WINST_VALUE[0]="@DL_EXTRACT_WINST_PATH[2]@\\svcpack\\aio-runtimes.exe" +WINST_NAME[0]="InstallJar" +WINST_VALUE[0]="@DL_EXTRACT_WINST_PATH[1]@\\tightvnc-jviewer.jar" -WINST_NAME[1]="MyVar" -WINST_VALUE[1]="My content" +WINST_NAME[1]="Install32Exe" +WINST_VALUE[1]="@DL_EXTRACT_WINST_PATH[2]@\\winrun4j\\bin\\WinRun4J.exe" + +WINST_NAME[2]="Install64Exe" +WINST_VALUE[2]="@DL_EXTRACT_WINST_PATH[2]@\\winrun4j\\bin\\WinRun4J64.exe" OPSI_INI_SECTION[0]="X86" -OPSI_INI_OPTION[0]="UninstallProg" -OPSI_INI_VALUE[0]="{XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX}" +OPSI_INI_OPTION[0]="UninstallProg32" +OPSI_INI_VALUE[0]="tightvnc-jviewer.exe" -OPSI_INI_SECTION[1]="CONFIG" -OPSI_INI_OPTION[1]="main.class" -OPSI_INI_VALUE[1]="com.glavsoft.viewer.Viewer" - -OPSI_INI_SECTION[2]="CONFIG" -OPSI_INI_OPTION[2]="classpath.1" -OPSI_INI_VALUE[2]="*.jar" - -#OPSI_INI_SECTION[3]="CONFIG" -#OPSI_INI_OPTION[3]="splash.image" -#OPSI_INI_VALUE[3]="SplashScreen.gif" +OPSI_INI_SECTION[1]="X86" +OPSI_INI_OPTION[1]="UninstallProg64" +OPSI_INI_VALUE[1]="tightvnc-jviewer.exe" diff --git a/builder-targets-cb.sh b/builder-targets-cb.sh index 27e0532..9a3d4a8 100644 --- a/builder-targets-cb.sh +++ b/builder-targets-cb.sh @@ -23,8 +23,3 @@ function cleanup() { echo "Cleanup" builder_cleanup } -function create() { - echo "Create" - builder_create - cp $INST_DIR/CLIENT_DATA/opsi-${PN}.ini $INST_DIR/CLIENT_DATA/tightvnc-jviewer.ini -}