Author: housel
Date: Sun Nov 14 04:40:35 2004
New Revision: 9586
Added:
trunk/fundev/packages/win32-nsis/choose-build-script.ini (contents, props
changed)
trunk/fundev/packages/win32-nsis/header.bmp (contents, props changed)
trunk/fundev/packages/win32-nsis/welcome.bmp (contents, props changed)
Modified:
trunk/fundev/packages/win32-nsis/fundev.nsi (contents, props changed)
trunk/fundev/packages/win32-nsis/path.nsh (props changed)
Log:
Bug: 7003 7161
Improve the Win32 installer, with new graphics and a page for selecting
an initial build script at install time.
Added: trunk/fundev/packages/win32-nsis/choose-build-script.ini
==============================================================================
--- (empty file)
+++ trunk/fundev/packages/win32-nsis/choose-build-script.ini Sun Nov 14
04:40:35 2004
@@ -0,0 +1,45 @@
+; Ini file generated by the HM NIS Edit IO designer.
+[Settings]
+NumFields=5
+
+[Field 1]
+Type=Groupbox
+Text=Linker
+Left=0
+Right=0
+Top=0
+Bottom=113
+
+[Field 2]
+Type=RadioButton
+Text=Microsoft Visual C++ 6.0
+Left=10
+Right=-5
+Top=14
+Bottom=24
+State=1
+
+[Field 3]
+Type=RadioButton
+Text=Microsoft Visual C++ .NET
+Left=10
+Right=-5
+Top=29
+Bottom=39
+
+[Field 4]
+Type=RadioButton
+Text=Microsoft Visual C++ Toolkit 2003 + Microsoft Platform SDK
+Left=10
+Right=-5
+Top=43
+Bottom=54
+
+[Field 5]
+Type=RadioButton
+Text=Pelles C for Windows
+Left=10
+Right=-5
+Top=58
+Bottom=69
+
Modified: trunk/fundev/packages/win32-nsis/fundev.nsi
==============================================================================
--- trunk/fundev/packages/win32-nsis/fundev.nsi (original)
+++ trunk/fundev/packages/win32-nsis/fundev.nsi Sun Nov 14 04:40:35 2004
@@ -7,24 +7,23 @@
# - replace rmdir /r with smth more intelligent ///warning messagebox added,
still ugly
# - restore previous file associations
-
;Functional Developer 2.1 Alpha 4 Install Script
-;install script version 0.2
-;Written by Denis Mashkevich (oudeis)
-;Date: 2004/05/30
-
+;Originally written by Denis Mashkevich (oudeis)
!include "path.nsh"
;--------------------------------
-;Define application defines
+;Application defines
!define APPNAME "Functional Developer" ;Define your own software name here
!define APPNAMEANDVERSION "${APPNAME} 2.1" ;Define your own software version
here
-;;-------------------------------------
+;-------------------------------------
;helper defines
+!define REGISTRY_KEY "Software\Functional Objects\${APPNAME}"
-
+!ifndef OUTFILE
+!define OUTFILE "fundev-win32.exe"
+!endif
;--------------------------------
;Configuration
@@ -32,18 +31,19 @@
!define MUI_ABORTWARNING
!define MUI_FINISHPAGE_RUN "$INSTDIR\bin\with-splash-screen.exe"
-!define MUI_FINISHPAGE_RUN_PARAMETERS "/k 2.1 /v $\"Version 2.1$\" /e
$\"Internal Edition$\" win32-environment.exe"
+!define MUI_FINISHPAGE_RUN_PARAMETERS "/k 2.1 /v $\"Version 2.1$\" /e
$\"Internal Edition$\" win32-environment.exe"
!define MUI_FINISHPAGE_RUN_CHECKED
-;Check this out
-#!define MUI_HEADERIMAGE
-#!define MUI_HEADERIMAGE_BITMAP "???.bmp"
+!define MUI_HEADERIMAGE
+!define MUI_HEADERIMAGE_BITMAP "header.bmp"
+!define MUI_WELCOMEFINISHPAGE_BITMAP "welcome.bmp"
;;;; Install properties
!insertmacro MUI_PAGE_WELCOME
-!insertmacro MUI_PAGE_LICENSE "src/License.txt"
+!insertmacro MUI_PAGE_LICENSE "..\..\License.txt"
!insertmacro MUI_PAGE_COMPONENTS
!insertmacro MUI_PAGE_DIRECTORY
+Page custom ChooseBuildScript
!insertmacro MUI_PAGE_INSTFILES
!insertmacro MUI_PAGE_FINISH
@@ -55,108 +55,143 @@
!insertmacro MUI_LANGUAGE "English"
!insertmacro MUI_RESERVEFILE_LANGDLL
-
+ReserveFile "choose-build-script.ini"
+!insertmacro MUI_RESERVEFILE_INSTALLOPTIONS
+
+;;;; Install functions
+
+Function .onInit
+ !insertmacro MUI_INSTALLOPTIONS_EXTRACT "choose-build-script.ini"
+FunctionEnd
+
+Function ChooseBuildScript
+ !insertmacro MUI_HEADER_TEXT "External Build System" \
+ "Choose an external build system for ${APPNAME}.$\n(The build script
can be changed after installation.)"
+ !insertmacro MUI_INSTALLOPTIONS_DISPLAY "choose-build-script.ini"
+FunctionEnd
+
;;;; General Settings
-OutFile "fundev-win32-20041002.exe"
+OutFile "${OUTFILE}"
Name "${APPNAMEANDVERSION}"
InstallDir "$PROGRAMFILES\Functional Objects\${APPNAME}"
-InstallDirRegKey HKEY_LOCAL_MACHINE "SOFTWARE\Functional
Objects\${APPNAME}\Install" "Install_Dir"
+InstallDirRegKey HKEY_LOCAL_MACHINE "${REGISTRY_KEY}\Install" "Install_Dir"
BrandingText "Functional Developer - www.functionalobjects.com,
www.gwydiondylan.org"
-LicenseData "src/License.txt"
+LicenseData "..\..\License.txt"
ShowInstDetails show
-
-
+
;;;; Install Types
InstType Typical
InstType Full
-
;;;; Installer Sections
Section "${APPNAME} Core" SecFundevCore
-
SectionIn 1 2 RO
- SetOutPath "$INSTDIR\"
- File /r "src\*.*"
-
-
- WriteRegStr HKEY_LOCAL_MACHINE "Software\Functional Objects\${APPNAME}\2.0"
"Library-Packs" "0xffff"
- WriteRegStr HKEY_LOCAL_MACHINE "Software\Functional Objects\${APPNAME}\2.0"
"Console-Tools" "Yes"
-
- WriteRegStr HKEY_LOCAL_MACHINE "Software\Functional Objects\${APPNAME}\2.1"
"Library-Packs" "0xffff"
- WriteRegStr HKEY_LOCAL_MACHINE "Software\Functional Objects\${APPNAME}\2.1"
"Console-Tools" "Yes"
-
- WriteRegStr HKEY_LOCAL_MACHINE "Software\Functional
Objects\${APPNAME}\License" "User" "FunDev Hacker"
- WriteRegStr HKEY_LOCAL_MACHINE "Software\Functional
Objects\${APPNAME}\License" "Expiration" "0000"
- WriteRegStr HKEY_LOCAL_MACHINE "Software\Functional
Objects\${APPNAME}\License" "Serial" "FDTNG-0200"
- WriteRegStr HKEY_LOCAL_MACHINE "Software\Functional
Objects\${APPNAME}\License" "Data" "74c1e46d0134432c7e8f17e2c38897c367f082a6"
+ SetOutPath "$INSTDIR\"
+ File /r ..\..\bin
+ File /r ..\..\lib
+ File /r ..\..\databases
+ File /r ..\..\Templates
+ File /r ..\..\Examples
+ File /r Sources
+
+ WriteRegStr HKEY_LOCAL_MACHINE "${REGISTRY_KEY}\2.0" "Library-Packs" "0xffff"
+ WriteRegStr HKEY_LOCAL_MACHINE "${REGISTRY_KEY}\2.0" "Console-Tools" "Yes"
+
+ WriteRegStr HKEY_LOCAL_MACHINE "${REGISTRY_KEY}\2.1" "Library-Packs" "0xffff"
+ WriteRegStr HKEY_LOCAL_MACHINE "${REGISTRY_KEY}\2.1" "Console-Tools" "Yes"
+
+ WriteRegStr HKEY_LOCAL_MACHINE "${REGISTRY_KEY}\License" "User" \
+ "FunDev Hacker"
+ WriteRegStr HKEY_LOCAL_MACHINE "${REGISTRY_KEY}\License" "Expiration" "0000"
+ WriteRegStr HKEY_LOCAL_MACHINE "${REGISTRY_KEY}\License" "Serial" \
+ "FDTNG-0200"
+ WriteRegStr HKEY_LOCAL_MACHINE "${REGISTRY_KEY}\License" "Data" \
+ "74c1e46d0134432c7e8f17e2c38897c367f082a6"
+
+ ;Read the build script selection
+ !insertmacro MUI_INSTALLOPTIONS_READ $0 "choose-build-script.ini" \
+ "Field 2" "State"
+ !insertmacro MUI_INSTALLOPTIONS_READ $1 "choose-build-script.ini" \
+ "Field 3" "State"
+ !insertmacro MUI_INSTALLOPTIONS_READ $2 "choose-build-script.ini" \
+ "Field 4" "State"
+ !insertmacro MUI_INSTALLOPTIONS_READ $3 "choose-build-script.ini" \
+ "Field 5" "State"
+
+ ;Display a messagebox if check box was checked
+ StrCmp $0 "1" "" +2
+ StrCpy $R0 "x86-win32-vc6-build.jam"
+ StrCmp $1 "1" "" +2
+ StrCpy $R0 "x86-win32-vc7-build.jam"
+ StrCmp $2 "1" "" +2
+ StrCpy $R0 "x86-win32-vc7-build.jam"
+ StrCmp $3 "1" "" +2
+ StrCpy $R0 "x86-win32-pellesc-build.jam"
-
- ;Write the installation path into the registry
- WriteRegStr HKLM "Software\Functional Objects\${APPNAME}\Install"
"Install_Dir" "$INSTDIR"
+ WriteRegStr HKCU "${REGISTRY_KEY}\2.1\Build-System" "build-script" \
+ "$INSTDIR\lib\$R0"
;Write the uninstall keys for Windows
WriteRegStr HKLM
"Software\Microsoft\Windows\CurrentVersion\Uninstall\FunDev" "DisplayName"
"${APPNAMEANDVERSION} (remove only)"
WriteRegStr HKLM
"Software\Microsoft\Windows\CurrentVersion\Uninstall\FunDev" "UninstallString"
'"$INSTDIR\uninstall.exe"'
WriteUninstaller "uninstall.exe"
-
SectionEnd
Section "Associate .ddb files" SecAssocDDB
-
- SectionIn 1 2
+ SectionIn 1 2
WriteRegStr HKEY_CLASSES_ROOT ".ddb" "" "Developer.Database.File"
- WriteRegStr HKEY_CLASSES_ROOT "Developer.Database.File" "" "Functional
Developer Compiler Database"
- WriteRegStr HKEY_CLASSES_ROOT "Developer.Database.File\DefaultIcon" ""
"$INSTDIR\\bin\\win32-environment.exe,3"
+ WriteRegStr HKEY_CLASSES_ROOT "Developer.Database.File" "" \
+ "Functional Developer Compiler Database"
+ WriteRegStr HKEY_CLASSES_ROOT "Developer.Database.File\DefaultIcon" "" \
+ "$INSTDIR\\bin\\win32-environment.exe,3"
- WriteRegStr HKLM "Software\Functional Objects\${APPNAME}\Install" ".ddb
associated" "Yes"
-
+ WriteRegStr HKLM "${REGISTRY_KEY}\Install" ".ddb associated" "Yes"
SectionEnd
Section "Associate .hdp files" SecAssocHDP
-
- SectionIn 1 2
+ SectionIn 1 2
WriteRegStr HKEY_CLASSES_ROOT ".hdp" "" "Developer.Project.File"
- WriteRegStr HKEY_CLASSES_ROOT "Developer.Project.File" "" "Functional
Developer Project"
- WriteRegStr HKEY_CLASSES_ROOT "Developer.Project.File\DefaultIcon" ""
"$INSTDIR\\bin\\win32-environment.exe,2"
+ WriteRegStr HKEY_CLASSES_ROOT "Developer.Project.File" "" \
+ "Functional Developer Project"
+ WriteRegStr HKEY_CLASSES_ROOT "Developer.Project.File\DefaultIcon" "" \
+ "$INSTDIR\\bin\\win32-environment.exe,2"
WriteRegStr HKEY_CLASSES_ROOT "Developer.Project.File\shell\open\command" ""
"$INSTDIR\\bin\\with-splash-screen.exe /k 2.1 /v $\"Version 2.1$\" /e
$\"Internal Edition$\" win32-environment.exe $\"%1$\""
WriteRegStr HKEY_CLASSES_ROOT "Developer.Project.File\shell\open\ddeexec" ""
"[OpenFile($\"%1$\")]"
WriteRegStr HKEY_CLASSES_ROOT
"Developer.Project.File\shell\open\ddeexec\Application" "" "FunctionalDeveloper"
WriteRegStr HKEY_CLASSES_ROOT
"Developer.Project.File\shell\open\ddeexec\ifexec" "" "[]"
WriteRegStr HKEY_CLASSES_ROOT
"Developer.Project.File\shell\open\ddeexec\Topic" "" "FunctionalDeveloper"
- WriteRegStr HKLM "Software\Functional Objects\${APPNAME}\Install" ".hdp
associated" "Yes"
-
+ WriteRegStr HKLM "${REGISTRY_KEY}\Install" ".hdp associated" "Yes"
SectionEnd
Section "Associate .spec files" SecAssocSPEC
-
- SectionIn 1 2
+ SectionIn 1 2
WriteRegStr HKEY_CLASSES_ROOT ".spec" "" "Developer.ToolSpec.File"
- WriteRegStr HKEY_CLASSES_ROOT ".spec" "Content Type" "text/plain"
- WriteRegStr HKEY_CLASSES_ROOT "Developer.ToolSpec.File" "" "Functional
Developer Tool Specification"
+ WriteRegStr HKEY_CLASSES_ROOT ".spec" "Content Type" "text/plain"
+ WriteRegStr HKEY_CLASSES_ROOT "Developer.ToolSpec.File" "" \
+ "Functional Developer Tool Specification"
WriteRegStr HKEY_CLASSES_ROOT "Developer.ToolSpec.File" "AlwaysShowExt" ""
- WriteRegStr HKEY_CLASSES_ROOT "Developer.ToolSpec.File\DefaultIcon" ""
"$INSTDIR\\bin\\win32-environment.exe,5"
+ WriteRegStr HKEY_CLASSES_ROOT "Developer.ToolSpec.File\DefaultIcon" "" \
+ "$INSTDIR\\bin\\win32-environment.exe,5"
WriteRegStr HKEY_CLASSES_ROOT "Developer.ToolSpec.File\shell\open\command"
"" "$INSTDIR\\bin\\with-splash-screen.exe /k 2.1 /v $\"Version 2.1$\" /e
$\"Internal Edition$\" win32-environment.exe $\"%1$\""
WriteRegStr HKEY_CLASSES_ROOT "Developer.ToolSpec.File\shell\open\ddeexec"
"" "[OpenFile($\"%1$\")]"
WriteRegStr HKEY_CLASSES_ROOT
"Developer.ToolSpec.File\shell\open\ddeexec\Application" ""
"FunctionalDeveloper"
WriteRegStr HKEY_CLASSES_ROOT
"Developer.ToolSpec.File\shell\open\ddeexec\ifexec" "" "[]"
WriteRegStr HKEY_CLASSES_ROOT
"Developer.ToolSpec.File\shell\open\ddeexec\Topic" "" "FunctionalDeveloper"
- WriteRegStr HKLM "Software\Functional Objects\${APPNAME}\Install"
".spec associated" "Yes"
-
+ WriteRegStr HKLM "${REGISTRY_KEY}\Install" ".spec associated" "Yes"
SectionEnd
Section "Associate .lid files" SecAssocLID
-
- SectionIn 1 2
+ SectionIn 1 2
WriteRegStr HKEY_CLASSES_ROOT ".lid" "" "Dylan.LID.File"
WriteRegStr HKEY_CLASSES_ROOT ".lid" "Content Type" "text/plain"
@@ -169,18 +204,16 @@
WriteRegStr HKEY_CLASSES_ROOT "Dylan.LID.File\shell\open\ddeexec\ifexec" ""
"[]"
WriteRegStr HKEY_CLASSES_ROOT "Dylan.LID.File\shell\open\ddeexec\Topic" ""
"FunctionalDeveloper"
- WriteRegStr HKLM "Software\Functional Objects\${APPNAME}\Install" ".lid
associated" "Yes"
-
+ WriteRegStr HKLM "${REGISTRY_KEY}\Install" ".lid associated" "Yes"
SectionEnd
Section "Associate .dyl, .dylan files" SecAssocDYLAN
-
- SectionIn 1 2
+ SectionIn 1 2
WriteRegStr HKEY_CLASSES_ROOT ".dyl" "" "Dylan.Source.File"
- WriteRegStr HKEY_CLASSES_ROOT ".dyl" "Content Type" "text/plain"
+ WriteRegStr HKEY_CLASSES_ROOT ".dyl" "Content Type" "text/plain"
WriteRegStr HKEY_CLASSES_ROOT ".dylan" "" "Dylan.Source.File"
- WriteRegStr HKEY_CLASSES_ROOT ".dylan" "Content Type" "text/plain"
+ WriteRegStr HKEY_CLASSES_ROOT ".dylan" "Content Type" "text/plain"
WriteRegStr HKEY_CLASSES_ROOT "Dylan.Source.File" "" "Dylan Source File"
WriteRegStr HKEY_CLASSES_ROOT "Dylan.Source.File" "AlwaysShowExt" ""
WriteRegStr HKEY_CLASSES_ROOT "Dylan.Source.File\DefaultIcon" ""
"$INSTDIR\\bin\\win32-environment.exe,1"
@@ -190,133 +223,131 @@
WriteRegStr HKEY_CLASSES_ROOT "Dylan.Source.File\shell\open\ddeexec\ifexec"
"" "[]"
WriteRegStr HKEY_CLASSES_ROOT "Dylan.Source.File\shell\open\ddeexec\Topic"
"" "FunctionalDeveloper"
- WriteRegStr HKLM "Software\Functional Objects\${APPNAME}\Install"
".dylan associated" "Yes"
-
+ WriteRegStr HKLM "${REGISTRY_KEY}\Install" ".dylan associated" "Yes"
SectionEnd
Section "Redistributable folder" SecRedistributable
-
SectionIn 1 2
+ AddSize 23000
SetOutPath "$INSTDIR\Redistributable\"
- File "src\bin\dxbigint.dll"
- File "src\bin\dxcffi.dll"
- File "src\bin\dxchnnls.dll"
- File "src\bin\dxcmndyl.dll"
- File "src\bin\dxcnsc.dll"
- File "src\bin\dxcollns.dll"
- File "src\bin\dxcom.dll"
- File "src\bin\dxcommnd.dll"
- File "src\bin\dxdb.dll"
- File "src\bin\dxdeuce.dll"
- File "src\bin\dxdmdce.dll"
- File "src\bin\dxdocon.dll"
- File "src\bin\dxdolec.dll"
- File "src\bin\dxdoles.dll"
- File "src\bin\dxdood.dll"
- File "src\bin\dxduim.dll"
- File "src\bin\dxdylan.dll"
- File "src\bin\dxfundyl.dll"
- File "src\bin\dxgarith.dll"
- File "src\bin\dxguitst.dll"
- File "src\bin\dxhtmhlp.dll"
- File "src\bin\dxio.dll"
- File "src\bin\dxmidi.dll"
- File "src\bin\dxnetwrk.dll"
- File "src\bin\dxole.dll"
- File "src\bin\dxoleaut.dll"
- File "src\bin\dxolecfr.dll"
- File "src\bin\dxolecon.dll"
- File "src\bin\dxolectl.dll"
- File "src\bin\dxoledlg.dll"
- File "src\bin\dxolesvr.dll"
- File "src\bin\dxorb.dll"
- File "src\bin\dxsystem.dll"
- File "src\bin\dxtstspc.dll"
- File "src\bin\dxtstwks.dll"
- File "src\bin\dxw32cmn.dll"
- File "src\bin\dxw32ctl.dll"
- File "src\bin\dxw32dde.dll"
- File "src\bin\dxw32dlg.dll"
- File "src\bin\dxw32gdi.dll"
- File "src\bin\dxw32gl.dll"
- File "src\bin\dxw32glu.dll"
- File "src\bin\dxw32knl.dll"
- File "src\bin\dxw32mm.dll"
- File "src\bin\dxw32red.dll"
- File "src\bin\dxw32reg.dll"
- File "src\bin\dxw32res.dll"
- File "src\bin\dxw32shl.dll"
- File "src\bin\dxw32usr.dll"
- File "src\bin\dxw32ver.dll"
- File "src\bin\dxwduim.dll"
+ CopyFiles "$INSTDIR\bin\dxbigint.dll" "$INSTDIR\Redistributable\"
+ CopyFiles "$INSTDIR\bin\dxcffi.dll" "$INSTDIR\Redistributable\"
+ CopyFiles "$INSTDIR\bin\dxchnnls.dll" "$INSTDIR\Redistributable\"
+ CopyFiles "$INSTDIR\bin\dxcmndyl.dll" "$INSTDIR\Redistributable\"
+ CopyFiles "$INSTDIR\bin\dxcnsc.dll" "$INSTDIR\Redistributable\"
+ CopyFiles "$INSTDIR\bin\dxcollns.dll" "$INSTDIR\Redistributable\"
+ CopyFiles "$INSTDIR\bin\dxcom.dll" "$INSTDIR\Redistributable\"
+ CopyFiles "$INSTDIR\bin\dxcommnd.dll" "$INSTDIR\Redistributable\"
+ CopyFiles "$INSTDIR\bin\dxdb.dll" "$INSTDIR\Redistributable\"
+ CopyFiles "$INSTDIR\bin\dxdeuce.dll" "$INSTDIR\Redistributable\"
+ CopyFiles "$INSTDIR\bin\dxdmdce.dll" "$INSTDIR\Redistributable\"
+ CopyFiles "$INSTDIR\bin\dxdocon.dll" "$INSTDIR\Redistributable\"
+ CopyFiles "$INSTDIR\bin\dxdolec.dll" "$INSTDIR\Redistributable\"
+ CopyFiles "$INSTDIR\bin\dxdoles.dll" "$INSTDIR\Redistributable\"
+ CopyFiles "$INSTDIR\bin\dxdood.dll" "$INSTDIR\Redistributable\"
+ CopyFiles "$INSTDIR\bin\dxduim.dll" "$INSTDIR\Redistributable\"
+ CopyFiles "$INSTDIR\bin\dxdylan.dll" "$INSTDIR\Redistributable\"
+ CopyFiles "$INSTDIR\bin\dxfundyl.dll" "$INSTDIR\Redistributable\"
+ CopyFiles "$INSTDIR\bin\dxgarith.dll" "$INSTDIR\Redistributable\"
+ CopyFiles "$INSTDIR\bin\dxguitst.dll" "$INSTDIR\Redistributable\"
+ CopyFiles "$INSTDIR\bin\dxhtmhlp.dll" "$INSTDIR\Redistributable\"
+ CopyFiles "$INSTDIR\bin\dxio.dll" "$INSTDIR\Redistributable\"
+ CopyFiles "$INSTDIR\bin\dxmidi.dll" "$INSTDIR\Redistributable\"
+ CopyFiles "$INSTDIR\bin\dxnetwrk.dll" "$INSTDIR\Redistributable\"
+ CopyFiles "$INSTDIR\bin\dxole.dll" "$INSTDIR\Redistributable\"
+ CopyFiles "$INSTDIR\bin\dxoleaut.dll" "$INSTDIR\Redistributable\"
+ CopyFiles "$INSTDIR\bin\dxolecfr.dll" "$INSTDIR\Redistributable\"
+ CopyFiles "$INSTDIR\bin\dxolecon.dll" "$INSTDIR\Redistributable\"
+ CopyFiles "$INSTDIR\bin\dxolectl.dll" "$INSTDIR\Redistributable\"
+ CopyFiles "$INSTDIR\bin\dxoledlg.dll" "$INSTDIR\Redistributable\"
+ CopyFiles "$INSTDIR\bin\dxolesvr.dll" "$INSTDIR\Redistributable\"
+ CopyFiles "$INSTDIR\bin\dxorb.dll" "$INSTDIR\Redistributable\"
+ CopyFiles "$INSTDIR\bin\dxsystem.dll" "$INSTDIR\Redistributable\"
+ CopyFiles "$INSTDIR\bin\dxtstspc.dll" "$INSTDIR\Redistributable\"
+ CopyFiles "$INSTDIR\bin\dxtstwks.dll" "$INSTDIR\Redistributable\"
+ CopyFiles "$INSTDIR\bin\dxw32cmn.dll" "$INSTDIR\Redistributable\"
+ CopyFiles "$INSTDIR\bin\dxw32ctl.dll" "$INSTDIR\Redistributable\"
+ CopyFiles "$INSTDIR\bin\dxw32dde.dll" "$INSTDIR\Redistributable\"
+ CopyFiles "$INSTDIR\bin\dxw32dlg.dll" "$INSTDIR\Redistributable\"
+ CopyFiles "$INSTDIR\bin\dxw32gdi.dll" "$INSTDIR\Redistributable\"
+ CopyFiles "$INSTDIR\bin\dxw32gl.dll" "$INSTDIR\Redistributable\"
+ CopyFiles "$INSTDIR\bin\dxw32glu.dll" "$INSTDIR\Redistributable\"
+ CopyFiles "$INSTDIR\bin\dxw32knl.dll" "$INSTDIR\Redistributable\"
+ CopyFiles "$INSTDIR\bin\dxw32mm.dll" "$INSTDIR\Redistributable\"
+ CopyFiles "$INSTDIR\bin\dxw32red.dll" "$INSTDIR\Redistributable\"
+ CopyFiles "$INSTDIR\bin\dxw32reg.dll" "$INSTDIR\Redistributable\"
+ CopyFiles "$INSTDIR\bin\dxw32res.dll" "$INSTDIR\Redistributable\"
+ CopyFiles "$INSTDIR\bin\dxw32shl.dll" "$INSTDIR\Redistributable\"
+ CopyFiles "$INSTDIR\bin\dxw32usr.dll" "$INSTDIR\Redistributable\"
+ CopyFiles "$INSTDIR\bin\dxw32ver.dll" "$INSTDIR\Redistributable\"
+ CopyFiles "$INSTDIR\bin\dxwduim.dll" "$INSTDIR\Redistributable\"
- WriteRegStr HKLM "Software\Functional Objects\${APPNAME}\Install"
"Redistributable folder created" "Yes"
-
+ WriteRegStr HKLM "${REGISTRY_KEY}\Install" "Redistributable folder created"
"Yes"
SectionEnd
Section "Modify path" SecModifyPath
- SectionIn 1 2
+ SectionIn 1 2
Push "$INSTDIR\\bin"
Call AddToPath
- WriteRegStr HKLM "Software\Functional Objects\${APPNAME}\Install" "Path
modified" "Yes"
-
+ WriteRegStr HKLM "${REGISTRY_KEY}\Install" "Path modified" "Yes"
SectionEnd
-
Section "Start Menu Shortcuts" SecStartMenuShortcuts
-
SectionIn 1 2
- CreateDirectory "$SMPROGRAMS\Functional Objects\Functional Developer"
+ CreateDirectory "$SMPROGRAMS\Functional Objects\Functional Developer"
CreateShortCut "$SMPROGRAMS\Functional Objects\Functional
Developer\Uninstall.lnk" "$INSTDIR\uninstall.exe" "" "$INSTDIR\uninstall.exe" 0
Delete "$SMPROGRAMS\Functional Objects\Functional
Developer\${APPNAMEANDVERSION}.lnk" ; Delete older link if exists
CreateShortCut "$SMPROGRAMS\Functional Objects\Functional
Developer\${APPNAMEANDVERSION}.lnk" "$\"$INSTDIR\bin\with-splash-screen.exe$\""
"/k 2.1 /v $\"Version 2.1$\" /e $\"Internal Edition$\" win32-environment.exe"
"$INSTDIR\bin\win32-environment.exe" 0
-
SectionEnd
-
Section "Desktop Shortcut" SecDesktopShortcut
-
SectionIn 1 2
; For past users, cleanup previous icon if still on desktop
Delete "$DESKTOP\${APPNAMEANDVERSION}.lnk"
CreateShortCut "$DESKTOP\${APPNAMEANDVERSION}.lnk"
"$\"$INSTDIR\bin\with-splash-screen.exe$\"" "/k 2.1 /v $\"Version 2.1$\" /e
$\"Internal Edition$\" win32-environment.exe"
"$INSTDIR\bin\win32-environment.exe" 0
-
SectionEnd
-
Section "Quick Launch Shortcut" SecQuickLaunchShortcut
-
SectionIn 2
- Delete "$QUICKLAUNCH\${APPNAMEANDVERSION}.lnk"
- CreateShortCut "$QUICKLAUNCH\${APPNAMEANDVERSION}.lnk"
"$\"$INSTDIR\bin\with-splash-screen.exe$\"" "/k 2.1 /v $\"Version 2.1$\" /e
$\"Internal Edition$\" win32-environment.exe"
"$INSTDIR\bin\win32-environment.exe" 0
+ Delete "$QUICKLAUNCH\${APPNAMEANDVERSION}.lnk"
+ CreateShortCut "$QUICKLAUNCH\${APPNAMEANDVERSION}.lnk"
"$\"$INSTDIR\bin\with-splash-screen.exe$\"" "/k 2.1 /v $\"Version 2.1$\" /e
$\"Internal Edition$\" win32-environment.exe"
"$INSTDIR\bin\win32-environment.exe" 0
SectionEnd
-
;;;; Component Section Descriptions
!insertmacro MUI_FUNCTION_DESCRIPTION_BEGIN
- !insertmacro MUI_DESCRIPTION_TEXT ${SecFundevCore} "${APPNAME} core files
(required)"
- !insertmacro MUI_DESCRIPTION_TEXT ${SecRedistributable} "Copy
redistributable files to separate folder. It is possible to run
make-redistributable.bat later to do this."
- !insertmacro MUI_DESCRIPTION_TEXT ${SecModifyPath} "Add $INSTDIR to
path."
- !insertmacro MUI_DESCRIPTION_TEXT ${SecAssocDDB} "Associate .ddb files
(Functional Developer Compiler Database) with ${APPNAME}."
- !insertmacro MUI_DESCRIPTION_TEXT ${SecAssocHDP} "Associate .hdp files
(Functional Developer Project) with ${APPNAME}."
- !insertmacro MUI_DESCRIPTION_TEXT ${SecAssocSPEC} "Associate .spec
files (Functional Developer Tool Specification) with ${APPNAME}."
- !insertmacro MUI_DESCRIPTION_TEXT ${SecAssocLID} "Associate .lid files
(Dylan Library Interchange Description) with ${APPNAME}."
- !insertmacro MUI_DESCRIPTION_TEXT ${SecAssocDYLAN} "Associate .dyl and
.dylan files (Dylan Source File) with ${APPNAME}."
- !insertmacro MUI_DESCRIPTION_TEXT ${SecStartMenuShortcuts} "Create
Start Menu shortcuts"
- !insertmacro MUI_DESCRIPTION_TEXT ${SecDesktopShortcut} "Create Desktop
shortcut"
- !insertmacro MUI_DESCRIPTION_TEXT ${SecQuickLaunchShortcut} "Create Quick
Launch shortcut"
+ !insertmacro MUI_DESCRIPTION_TEXT ${SecFundevCore} \
+ "${APPNAME} core files (required)"
+ !insertmacro MUI_DESCRIPTION_TEXT ${SecRedistributable} \
+ "Copy redistributable files to separate folder. It is possible
to run make-redistributable.bat later to do this."
+ !insertmacro MUI_DESCRIPTION_TEXT ${SecModifyPath} \
+ "Add $INSTDIR\bin to path."
+ !insertmacro MUI_DESCRIPTION_TEXT ${SecAssocDDB} \
+ "Associate .ddb files (Functional Developer Compiler Database)
with ${APPNAME}."
+ !insertmacro MUI_DESCRIPTION_TEXT ${SecAssocHDP} \
+ "Associate .hdp files (Functional Developer Project) with
${APPNAME}."
+ !insertmacro MUI_DESCRIPTION_TEXT ${SecAssocSPEC} \
+ "Associate .spec files (Functional Developer Tool
Specification) with ${APPNAME}."
+ !insertmacro MUI_DESCRIPTION_TEXT ${SecAssocLID} \
+ "Associate .lid files (Dylan Library Interchange Description)
with ${APPNAME}."
+ !insertmacro MUI_DESCRIPTION_TEXT ${SecAssocDYLAN} \
+ "Associate .dyl and .dylan files (Dylan Source File) with
${APPNAME}."
+ !insertmacro MUI_DESCRIPTION_TEXT ${SecStartMenuShortcuts} \
+ "Create Start Menu shortcuts"
+ !insertmacro MUI_DESCRIPTION_TEXT ${SecDesktopShortcut} \
+ "Create Desktop shortcut"
+ !insertmacro MUI_DESCRIPTION_TEXT ${SecQuickLaunchShortcut} \
+ "Create Quick Launch shortcut"
!insertmacro MUI_FUNCTION_DESCRIPTION_END
-
;;;; Uninstaller Section
Section "Uninstall"
- MessageBox MB_YESNO|MB_ICONEXCLAMATION "Warning: If you continue, the whole
installation directory ($INSTDIR) will be deleted.$\nIf you have made any
changes to the contents of the directory that you would like to preserve,
please backup them before proceeding.$\nAre you sure you want to continue?"
IDNO cancel
+ MessageBox MB_YESNO|MB_ICONEXCLAMATION "Warning: If you continue, the entire
installation directory ($INSTDIR) will be deleted.$\nIf you have made any
changes to the contents of the directory that you would like to preserve,
please back them up before proceeding.$\nAre you sure you want to continue?"
IDNO cancel
RMDir /r "$INSTDIR"
; Delete start menu stuff
@@ -327,8 +358,7 @@
; Delete quicklaunch icon
Delete "$QUICKLAUNCH\${APPNAMEANDVERSION}.lnk"
-
-
+
;;; registry stuff
DeleteRegKey HKEY_CLASSES_ROOT ".ddb"
@@ -358,10 +388,11 @@
DeleteRegKey HKLM
"Software\Microsoft\Windows\CurrentVersion\Uninstall\FunDev"
;Remove bin dir from path
- Push "$INSTDIR\\bin"
+ Push "$INSTDIR\\bin"
Call un.RemoveFromPath
-
- cancel:
+
+cancel:
SectionEnd
-;;;; eof
\ No newline at end of file
+;;;; eof
+
Added: trunk/fundev/packages/win32-nsis/header.bmp
==============================================================================
Binary file. No diff available.
Added: trunk/fundev/packages/win32-nsis/welcome.bmp
==============================================================================
Binary file. No diff available.
_______________________________________________
Gd-chatter mailing list
Gd-chatter@xxxxxxxxxxxxxxxx
https://gauss.gwydiondylan.org/mailman/listinfo/gd-chatter
|
