Revision: 41275
http://brlcad.svn.sourceforge.net/brlcad/?rev=41275&view=rev
Author: brlcad
Date: 2010-11-08 15:43:40 +0000 (Mon, 08 Nov 2010)
Log Message:
-----------
don't comment out code without leaving a comment why it's commented out but
needs to stay. remove dead code.
Modified Paths:
--------------
brlcad/trunk/misc/nsis/brlcad.nsi
Modified: brlcad/trunk/misc/nsis/brlcad.nsi
===================================================================
--- brlcad/trunk/misc/nsis/brlcad.nsi 2010-11-08 15:37:23 UTC (rev 41274)
+++ brlcad/trunk/misc/nsis/brlcad.nsi 2010-11-08 15:43:40 UTC (rev 41275)
@@ -8,8 +8,8 @@
!include VERSION.txt
;--------------------------------
-;Include Modern UI
+; Modurn User Interface
!include "MUI.nsh"
!include "FileFunc.nsh"
!include "WordFunc.nsh"
@@ -53,10 +53,6 @@
; The default installation directory
InstallDir $PROGRAMFILES\BRL-CAD\${VERSION}
- ; Registry key to check for directory (so if you install again, it will
- ; overwrite the old one automatically)
-; InstallDirRegKey HKLM "Software\BRL-CAD ${VERSION}" "Install_Dir"
-
; Make it look pretty in XP
XPStyle on
@@ -98,15 +94,7 @@
!insertmacro MUI_PAGE_LICENSE "..\..\COPYING"
!insertmacro MUI_PAGE_COMPONENTS
!insertmacro MUI_PAGE_DIRECTORY
-
- ;Start Menu Folder Page Configuration
-; !define MUI_STARTMENUPAGE_REGISTRY_ROOT "HKLM"
-; !define MUI_STARTMENUPAGE_REGISTRY_KEY "Software\BRL-CAD\${VERSION}"
-; !define MUI_STARTMENUPAGE_REGISTRY_VALUENAME "Start Menu Folder"
-
!insertmacro MUI_PAGE_STARTMENU Application $STARTMENU_FOLDER
-
-
!insertmacro MUI_PAGE_INSTFILES
;Finished page configuration
@@ -157,20 +145,6 @@
SetOutPath $INSTDIR\share
File /r "..\..\brlcadInstall${PLATFORM}\share\*"
- ; Write the installation path into the registry
-; WriteRegStr HKLM "SOFTWARE\BRL-CAD ${VERSION}" "Install_Dir" "$INSTDIR"
-
- ; Write the uninstall keys for Windows
-; WriteRegStr HKLM
"Software\Microsoft\Windows\CurrentVersion\Uninstall\BRL-CAD ${VERSION}"
"DisplayName" "BRL-CAD ${VERSION}"
-; WriteRegStr HKLM
"Software\Microsoft\Windows\CurrentVersion\Uninstall\BRL-CAD ${VERSION}"
"DisplayVersion" "${VERSION}"
-; WriteRegStr HKLM
"Software\Microsoft\Windows\CurrentVersion\Uninstall\BRL-CAD ${VERSION}"
"VersionMajor" "${MAJOR}"
-; WriteRegStr HKLM
"Software\Microsoft\Windows\CurrentVersion\Uninstall\BRL-CAD ${VERSION}"
"VersionMinor" "${MINOR}"
-; WriteRegStr HKLM
"Software\Microsoft\Windows\CurrentVersion\Uninstall\BRL-CAD ${VERSION}"
"InstallLocation" '"$INSTDIR"'
-; WriteRegStr HKLM
"Software\Microsoft\Windows\CurrentVersion\Uninstall\BRL-CAD ${VERSION}"
"URLInfoAbout" "http://brlcad.org";
-; WriteRegStr HKLM
"Software\Microsoft\Windows\CurrentVersion\Uninstall\BRL-CAD ${VERSION}"
"URLUpdateInfo" "http://brlcad.org";
-; WriteRegStr HKLM
"Software\Microsoft\Windows\CurrentVersion\Uninstall\BRL-CAD ${VERSION}"
"HelpLink" "http://irc.brlcad.org";
-; WriteRegStr HKLM
"Software\Microsoft\Windows\CurrentVersion\Uninstall\BRL-CAD ${VERSION}"
"UninstallString" '"$INSTDIR\uninstall.exe"'
-
;Create uninstaller
WriteUninstaller "uninstall.exe"
@@ -196,30 +170,16 @@
SectionEnd
Section "Documentation (required)" Documentation
- ; SectionIn RO means temporarily required
- ;SectionIn RO
- ;SetOutPath $INSTDIR\doc
- ;File /r ..\..\brlcadInstall${PLATFORM}\doc\*
!insertmacro MUI_STARTMENU_WRITE_BEGIN Application
;Main start menu shortcuts
SetOutPath $INSTDIR
CreateDirectory "$SMPROGRAMS\$STARTMENU_FOLDER${INSTALLERSUFFIX}\Manuals"
- ;CreateShortCut
"$SMPROGRAMS\$STARTMENU_FOLDER${INSTALLERSUFFIX}\Manuals\Archer.lnk"
"$BRLCAD_DATA_DIR\html\manuals\archer\Archer_Documentation.chm" ""
"$INSTDIR\archer.ico" 0
CreateShortCut
"$SMPROGRAMS\$STARTMENU_FOLDER${INSTALLERSUFFIX}\Manuals\BRL-CAD.lnk"
"$BRLCAD_DATA_DIR\html\manuals\index.html" "" "$INSTDIR\brlcad.ico" 0
CreateShortCut
"$SMPROGRAMS\$STARTMENU_FOLDER${INSTALLERSUFFIX}\Manuals\MGED.lnk"
"$BRLCAD_DATA_DIR\html\manuals\mged\index.html" "" "$INSTDIR\brlcad.ico" 0
!insertmacro MUI_STARTMENU_WRITE_END
SectionEnd
-;Section "Samples" Samples
-; SetOutPath $INSTDIR\Samples
-; File ..\..\brlcadInstall${PLATFORM}\Samples\*
-;SectionEnd
-;Section "Developement headers" Developer
-; SetOutPath $INSTDIR\include
-; File ..\..\brlcadInstall${PLATFORM}\include\*
-;SectionEnd
-
;--------------------------------
;Descriptions
@@ -227,16 +187,12 @@
;Language strings
LangString DESC_BRL-CAD ${LANG_ENGLISH} "Installs the main application and
the associated data files."
LangString DESC_Documentation ${LANG_ENGLISH} "Installs documentation for
BRL-CAD."
- ;LangString DESC_Samples ${LANG_ENGLISH} "Installs optional geometry
samples."
- ;LangString DESC_Developer ${LANG_ENGLISH} "Installs programming headers for
developers."
;Assign language strings to sections
!insertmacro MUI_FUNCTION_DESCRIPTION_BEGIN
!insertmacro MUI_DESCRIPTION_TEXT ${BRL-CAD} $(DESC_BRL-CAD)
!insertmacro MUI_DESCRIPTION_TEXT ${Documentation} $(DESC_Documentation)
- ;!insertmacro MUI_DESCRIPTION_TEXT ${Samples} $(DESC_Samples)
- ;!insertmacro MUI_DESCRIPTION_TEXT ${Developer} $(DESC_Developer)
!insertmacro MUI_FUNCTION_DESCRIPTION_END
@@ -246,10 +202,6 @@
Section "Uninstall"
- ; Remove registry keys
-; DeleteRegKey HKLM
"Software\Microsoft\Windows\CurrentVersion\Uninstall\BRL-CAD ${VERSION}"
-; DeleteRegKey HKLM "SOFTWARE\BRL-CAD ${VERSION}"
-
!insertmacro MUI_STARTMENU_GETFOLDER Application $MUI_TEMP
; Remove shortcuts, if any
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
The Next 800 Companies to Lead America's Growth: New Video Whitepaper
David G. Thomson, author of the best-selling book "Blueprint to a
Billion" shares his insights and actions to help propel your
business during the next growth cycle. Listen Now!
http://p.sf.net/sfu/SAP-dev2dev
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
