Changeset 1099

Timestamp:

Dec 8, 2010 12:44:19 PM (13 years ago)

Author:

toby

Message:

update install scripts

Location:

gsas/win/dist

Files:

• StartEXPGUI.bat (added)
• StartPC-GSAS.bat (added)
• bootstrap.bat (modified) (2 diffs)
• makeregistry.bat (modified) (2 diffs)

gsas/win/dist/bootstrap.bat

@@ -1 @@
-REM this will be run in the GSAS installation directory 
-mkdir MyWork
+@REM this script must be run from the GSAS installation directory
+@echo *****************************************
+@echo Press return to start GSAS/EXPGUI install
+@echo *****************************************
+@pause
+@REM do on initial install
+@mkdir MyWork
+@ECHO Loading GSAS from subversion server
 .\svn\bin\svn co https://subversion.xor.aps.anl.gov/EXPGUI/gsas/all .
+@if exist expgui goto getexpgui
+@ECHO *************************************************************************
+@ECHO Load from repository failed. Perhaps internet access is blocked or down.
+@ECHO Install failed!
+@ECHO *************************************************************************
+@pause
+@exit
+:getexpgui
 @echo loading EXPGUI from repository
 .\svn\bin\svn switch https://subversion.xor.aps.anl.gov/EXPGUI/trunk/ expgui
@@ -8 +22 @@
 @echo loading pgplot
 .\svn\bin\svn switch https://subversion.xor.aps.anl.gov/EXPGUI/gsas/win/pgl/ pgl
-pause
+@echo **************************************************
+@echo Install has completed. EXPGUI will now be started.
+@echo **************************************************
+@pause
+%COMSPEC% /c "start exe\ncnrpack.exe expgui\expgui"
+exit

gsas/win/dist/makeregistry.bat

@@ +1 @@
+@ECHO OFF
 @echo =======================================================
 @echo This file creates registry entries for GSAS and EXPGUI
@@ -10 +11 @@
 set gsasloc=%gsasloc:\*=\%
 
-reg add HKLM\Software\Classes\.exp /ve /d EXPfile /f
-reg add HKLM\Software\Classes\EXPfile /v "GSAS experiment file" /d "GSAS Experiment File" /f
-reg add HKLM\Software\Classes\EXPfile\DefaultIcon /ve /d %gsasloc%gsas.ico,0 /f
-reg add HKLM\Software\Classes\EXPfile\Shell\EXPEDT\command /ve /d "%gsasloc%exe\expedt.exe %%1" /f
-reg add HKLM\Software\Classes\EXPfile\Shell\EXPGUI\command /ve /d "%gsasloc%exe\ncnrpack.exe %gsasloc%expgui\expgui ""%%1""" /f
-reg add HKLM\Software\Classes\EXPfile\Shell\GENLES\command /ve /d "%gsasloc%exe\genles.exe %%1" /f
-reg add HKLM\Software\Classes\EXPfile\Shell\PC-GSAS\command /ve /d "%gsasloc%exe\PC-GSAS.exe %%1" /f
-reg add HKLM\Software\Classes\EXPfile\Shell\POWPLOT\command /ve /d "%gsasloc%exe\powplot.exe %%1" /f
-reg add HKLM\Software\Classes\EXPfile\Shell\POWPREF\command /ve /d "%gsasloc%exe\powpref.exe %%1" /f
+REM test if representative files are found
+IF NOT EXIST %gsasloc%gsas.ico GOTO IconNotFound
+IF NOT EXIST %gsasloc%exe  GOTO EXENotFound
+IF NOT EXIST %gsasloc%exe\ncnrpack.exe  GOTO TclNotFound
+
+
+REM changed from HKLM to HKCU due to problems on Vista(?)
+@ECHO ON
+reg add HKCU\Software\Classes\.exp /ve /d EXPfile /f
+reg add HKCU\Software\Classes\EXPfile /v "GSAS experiment file" /d "GSAS Experiment File" /f
+reg add HKCU\Software\Classes\EXPfile\DefaultIcon /ve /d %gsasloc%gsas.ico,0 /f
+reg add HKCU\Software\Classes\EXPfile\Shell\EXPEDT\command /ve /d "%gsasloc%exe\expedt.exe %%1" /f
+reg add HKCU\Software\Classes\EXPfile\Shell\EXPGUI\command /ve /d "%gsasloc%exe\ncnrpack.exe %gsasloc%expgui\expgui ""%%1""" /f
+reg add HKCU\Software\Classes\EXPfile\Shell\GENLES\command /ve /d "%gsasloc%exe\genles.exe %%1" /f
+reg add HKCU\Software\Classes\EXPfile\Shell\PC-GSAS\command /ve /d "%gsasloc%exe\PC-GSAS.exe %%1" /f
+reg add HKCU\Software\Classes\EXPfile\Shell\POWPLOT\command /ve /d "%gsasloc%exe\powplot.exe %%1" /f
+reg add HKCU\Software\Classes\EXPfile\Shell\POWPREF\command /ve /d "%gsasloc%exe\powpref.exe %%1" /f
 
 REM The following command can be edited to select the default command when a .EXP file is double clicked
 REM Choices are EXPGUI, EXPEDT, GENLES, PS-GSAS, POWPREF or POWPLOT
-reg add HKLM\Software\Classes\EXPfile\Shell /ve /d EXPGUI /f
+reg add HKCU\Software\Classes\EXPfile\Shell /ve /d EXPGUI /f
 
 pause
+exit
+
+:IconNotFound
+echo Error: File %gsasloc%gsas.ico was not found. Was this batch file run from a location other than the GSAS directory?
+pause
+        exit
+
+:EXENotFound
+echo ERROR: Directory %gsasloc%exe was not found. Was this batch file run from a location other than the GSAS directory?
+pause
+exit
+
+:TclNotFound
+echo ERROR: File %gsasloc%exe\ncnrpack.exe was not found. Was this batch file run from a location other than the GSAS directory?
+pause
+exit
+