Index: win_installer/Language-Pack-BUILD.txt =================================================================== diff -u -rc3408ee36303a40bbd2f147edbf3c93da21b5323 -r7049d0b532565ac700d879ca175d5ed8f6d66c67 --- win_installer/Language-Pack-BUILD.txt (.../Language-Pack-BUILD.txt) (revision c3408ee36303a40bbd2f147edbf3c93da21b5323) +++ win_installer/Language-Pack-BUILD.txt (.../Language-Pack-BUILD.txt) (revision 7049d0b532565ac700d879ca175d5ed8f6d66c67) @@ -2,9 +2,14 @@ -------------------------- - Builds to win_installer\build +- Language files are lacked up on installation at: + [LAMSDIR]\jboss-4.0.2\server\default\deploy\lams.ear\lams-dictionary.jar\backup +STEPS +----- + 1) Make sure you have all the latest language files in your lams workspace, you - can do this by simply synchronising with the CVS repository + can do this by simply synchronising and updating with the CVS repository 2) Put the date that you want for the install at this line (around line 35): !define VERSION "2006-20-12" (example) Make sure it is in the form "yyyy-mm-dd" Index: win_installer/mysql-connector-java-3.1.12-bin.jar =================================================================== diff -u Binary files differ Index: win_installer/src/language-pack.nsi =================================================================== diff -u -rc9c0ea17e76fb9eb622bc68f1c9cf8958bdc9c42 -r7049d0b532565ac700d879ca175d5ed8f6d66c67 --- win_installer/src/language-pack.nsi (.../language-pack.nsi) (revision c9c0ea17e76fb9eb622bc68f1c9cf8958bdc9c42) +++ win_installer/src/language-pack.nsi (.../language-pack.nsi) (revision 7049d0b532565ac700d879ca175d5ed8f6d66c67) @@ -123,12 +123,15 @@ WriteRegStr HKLM "${REG_HEAD}" "language_pack" $VERSION_INT Detailprint 'Writing Language pack version ${VERSION} to registry: "${REG_HEAD}"' - setoutpath $EXEDIR - File /r "..\zip" + setoutpath "$INSTDIR\zip" + File /r "..\zip\7za.exe" ;backup existing language files call zipLanguages + rmdir "$INSTDIR\zip" + + ; copy language files from LAMS projects to a folder in $INSTDIR call copyProjects @@ -144,8 +147,6 @@ call updateDatabase DetailPrint "LAMS Language Pack ${VERSION} install successfull" - DetailPrint "$TEMP" - SectionEnd @@ -168,6 +169,7 @@ ReadRegStr $DB_PASS HKLM "${REG_HEAD}" "db_pass" # Abort install if already installed or if a newer version is installed + strcpy $OLD_VERSION "20061205" ;default old version (Date of First language pack of LAMS2) ReadRegStr $0 HKLM "${REG_HEAD}" "language_pack" ${VersionCompare} "$VERSION_INT" "$0" $1 ${If} $1 == "0" @@ -178,9 +180,10 @@ MessageBox MB_OK|MB_ICONSTOP "Your current language pack is a newer version than this version: LAMS-LanguagePack-$0" Abort ${EndIf} - strcpy $OLD_VERSION $0 + ${If} $0 != "" + strcpy $OLD_VERSION $0 + ${EndIf} - # Abort if there is no version of LAMS2 installed ReadRegStr $0 HKLM "${REG_HEAD}" "version" ${If} $0 = "" @@ -222,9 +225,9 @@ #zip existing language files setoutpath $INSTDIR - rmdir /r "$BACKUP_DIR" + ;rmdir /r "$BACKUP_DIR" createdirectory "$BACKUP_DIR" - Strcpy $4 '$EXEDIR\zip\7za.exe a -r -tzip "$BACKUP_DIR\lamsDictionaryBak-${VERSION}.zip" "*"' + Strcpy $4 '$INSTDIR\zip\7za.exe a -r -tzip "$BACKUP_DIR\lamsDictionaryBak-$OLD_VERSION.zip" "*"' nsExec::ExecToStack $4 pop $8 pop $9 @@ -528,10 +531,14 @@ setoutpath "$INSTDIR" File /a updateLocales.sql File /a LanguagePack.xml - File /r "..\apache-ant-1.6.5" - #File /a "..\apache-ant-1.6.5\bin\ant.bat" - #File /a "..\apache-ant-1.6.5\lib\ant.jar" + + setoutpath "$INSTDIR\apache-ant-1.6.5\bin" + File /a "..\apache-ant-1.6.5\bin\*" + + setoutpath "$INSTDIR\apache-ant-1.6.5\lib" + File /a "..\apache-ant-1.6.5\lib\*" + ; update locals must be stored as a procedure first ; nsExec wont let me do "mysql < insertLocale.sql" so i had to use ant ; create installer.properties