Changeset 11519

Timestamp:

02/23/12 22:39:37 (13 years ago)

Author:

Eric.Larour

Message:

Now handles 32 and 64 bits. Picks up scripts directly, instead of through bin

Location:

issm/trunk-jpl/installers/win7

Files:

• ISSM.initial.aip (modified) (1 diff)
• aic.sh (modified) (2 diffs)

issm/trunk-jpl/installers/win7/ISSM.initial.aip

@@ -42 +42 @@
   <COMPONENT cid="caphyon.advinst.msicomp.MsiFilesComponent">
     <ROW File="README.rtf" Component_="matlabissm.bat" FileName="README.rtf" Attributes="0" SourcePath="..\..\bin\README.rtf" SelfReg="false"/>
-    <ROW File="matlabissm.bat" Component_="matlabissm.bat" FileName="matlab~1.bat|matlabissm.bat" Attributes="0" SourcePath="..\..\bin\matlabissm.bat" SelfReg="false" NextFile="README.rtf"/>
+    <ROW File="matlabissm.bat" Component_="matlabissm.bat" FileName="matlab~1.bat|matlabissm.bat" Attributes="0" SourcePath="..\..\scripts\matlabissm.bat" SelfReg="false" NextFile="README.rtf"/>
   </COMPONENT>
   <COMPONENT cid="caphyon.advinst.msicomp.BuildComponent">

issm/trunk-jpl/installers/win7/aic.sh

@@ -13 +13 @@
 END
 
-ls $ISSM_TIER_WIN/bin/*.bat $ISSM_TIER_WIN/bin/startup.m $ISSM_TIER_WIN/bin/*.h | awk '{printf("AddFile APPDIR %s\n",$1);}' | sed 's/\//\\/g' >> ISSM.aic
+ls $ISSM_TIER_WIN/scripts/*.bat $ISSM_TIER_WIN/bin/startup.m $ISSM_TIER_WIN/bin/*.h | awk '{printf("AddFile APPDIR %s\n",$1);}' | sed 's/\//\\/g' >> ISSM.aic
 
 cat << END >> ISSM.aic
 AddFolder PersonalFolder $ISSM_TIER_WIN\test
 AddFolder APPDIR $ISSM_TIER_WIN\bin
-SetPackageType x64 
 DelEnvironment ISSM_TESTS
 NewEnvironment -name ISSM_TESTS -value [test_Dir]
@@ -34 +33 @@
 #Get rid of temporary files: 
 cp ISSM-SetupFiles/ISSM.msi ./
-rm -rf ISSM.aip ISSM-SetupFiles
+rm -rf ISSM.aip ISSM-SetupFiles ISSM.aic