Index: win_installer/updater/documents/license.txt =================================================================== diff -u -rb9e4d29537ce1a8863db9b40e0cc65dbf8274747 -rb2f18c1f809c0be0439241c0f4d48ec8df8d1791 --- win_installer/updater/documents/license.txt (.../license.txt) (revision b9e4d29537ce1a8863db9b40e0cc65dbf8274747) +++ win_installer/updater/documents/license.txt (.../license.txt) (revision b2f18c1f809c0be0439241c0f4d48ec8df8d1791) @@ -36,7 +36,6 @@ jgroups.jar GNU Lesser General Public Licence jmock-2003-03-19.jar jMock Project License joda-time-0.98.jar Joda Software License 1.0 -jsMath Apache License 2.0 jstl.jar JSTL License 1.1 log4j-1.2.13.jar Apache Software License 1.1 mysql-connector- (CDDL Common Development and Index: win_installer/updater/src/lams_components.ini =================================================================== diff -u -ra346e8c8f13dc57dfca4a13f75d0b4276969e207 -rb2f18c1f809c0be0439241c0f4d48ec8df8d1791 --- win_installer/updater/src/lams_components.ini (.../lams_components.ini) (revision a346e8c8f13dc57dfca4a13f75d0b4276969e207) +++ win_installer/updater/src/lams_components.ini (.../lams_components.ini) (revision b2f18c1f809c0be0439241c0f4d48ec8df8d1791) @@ -1,5 +1,5 @@ [Settings] -NumFields=5 +NumFields=4 [Field 1] Type=Label @@ -32,13 +32,3 @@ Right=291 Bottom=14 Text=LAMS 2.0.1 Full Install - -[Field 5] -;InstallOptions Editor Metadata (DO NOT EDIT): locked=true -Type=CheckBox -Left=10 -Top=70 -Right=268 -Bottom=80 -Text=Include jsMath (Optional web component for maths symbol display) -State=0 Index: win_installer/updater/src/updater.nsi =================================================================== diff -u -refaf8f2b1527f59a03ba9a00ccd4b2815db231c1 -rb2f18c1f809c0be0439241c0f4d48ec8df8d1791 --- win_installer/updater/src/updater.nsi (.../updater.nsi) (revision efaf8f2b1527f59a03ba9a00ccd4b2815db231c1) +++ win_installer/updater/src/updater.nsi (.../updater.nsi) (revision b2f18c1f809c0be0439241c0f4d48ec8df8d1791) @@ -173,7 +173,6 @@ Var RETAIN_DIR ; path to directory to retain files on uninstall Var RETAIN_FILES ; bool value to devide whether to retain files Var IS_UPDATE ; bool value to determine whether this is an update -Var INCLUDE_JSMATH ; bool value to determine whether to include JBOSS Var TOOL_SIG ; tool signature used for tool deployer Var TOOL_DIR ; tool directory used for tool deployer Var TIMESTAMP ; timestamp @@ -363,30 +362,7 @@ SectionEnd SectionGroupEnd -SectionGroup "jsMath (optional)" - - Section "jsMath (expanded)" jsmathe - ${if} $INCLUDE_JSMATH == 1 - DetailPrint "Including jsMath in LAMS ${VERSION}" - SetOutPath "$TEMP" - File /a "${BASE_PROJECT_DIR}jsmath\build\lib\jsMath.war" - CreateDirectory "$INSTDIR\jboss-4.0.2\server\default\deploy\jsMath.war" - SetOutPath "$INSTDIR\jboss-4.0.2\server\default\deploy\jsMath.war" - DetailPrint "$JDK_DIR\bin\jar xvf $TEMP\jsMath.war" - DetailPrint "Expanding jsMath.war... This may take several minutes" - nsExec::ExecToStack "$JDK_DIR\bin\jar xf $TEMP\jsMath.war" - Pop $0 - Pop $1 - ${If} $0 != 0 - DetailPrint "Failed to expand jsMath.war." - DetailPrint "Error: $1" - ${EndIf} - Delete "$TEMP\jsMath.war" - ${endif} - SectionEnd -SectionGroupEnd - # functions # @@ -453,9 +429,6 @@ !insertmacro MUI_INSTALLOPTIONS_EXTRACT "lams_components.ini" !insertmacro MUI_INSTALLOPTIONS_EXTRACT "final.ini" - # set jsmath exploded size (assumes 4KB cluster size on destination hdd) - ;SectionSetSize ${jsmathe} 81816 - FunctionEnd @@ -575,13 +548,7 @@ FunctionEnd Function PostComponents - !insertmacro MUI_INSTALLOPTIONS_READ $INCLUDE_JSMATH "lams_components.ini" "Field 5" "State" - ${if} $INCLUDE_JSMATH == "1" - SectionSetSize ${jsmathe} 81816 - ${else} - SectionSetSize ${jsmathe} 0 - ${endif} - + FunctionEnd Function DirectoryLeave