Commit a394d4f0 authored by Jo Cook's avatar Jo Cook

Bumped version numbers and spell-checked docs, not that anyone reads them

parent f7308feb
......@@ -10,7 +10,7 @@
!define MUI_HEADERIMAGE_BITMAP "E:\portablegis_working\Astun_Logo.bmp" ; optional
!define MUI_ABORTWARNING
!define MUI_ICON "${NSISDIR}\Contrib\Graphics\Icons\modern-install.ico"
;--------------------------------
; Other required files
......@@ -23,14 +23,14 @@
; App-specific definitions
!define SIZE "3300" ;add here total uncompressed data size in Mb of your application
!define APPNAME "Portable GIS v5.6"
!define APPNAME "Portable GIS v5.8"
Name '${APPNAME}'
OutFile 'portablegis_setup_v56_astun.exe'
OutFile 'portablegis_setup_v58_astun.exe'
AllowRootDirInstall true
;--------------------------------
; Pages (generic ones prefixed with insertmacro)
!insertmacro MUI_PAGE_WELCOME
!insertmacro MUI_PAGE_LICENSE "E:\portablegis_working\usbgis\docs\license.txt"
Page Custom CustomCreate CustomLeave
......@@ -51,15 +51,15 @@ Page Custom CustomCreate CustomLeave
!insertmacro MUI_LANGUAGE "English"
;--------------------------------
;--------------------------------
; Installer Sections
Section "primary" SecPrimary
setOutPath $INSTDIR
file /r usbgis
file /oname=portablegis.exe portablegis_astun.exe
file /oname=portablegis.exe portablegis_astun.exe
file portablegis_readme.txt
;Create uninstaller
WriteUninstaller "$INSTDIR\Uninstall.exe"
SectionEnd
......@@ -78,7 +78,7 @@ Section "Uninstall"
SectionEnd
;--------------------------------
;--------------------------------
;Descriptions
;Language strings
......@@ -93,10 +93,10 @@ SectionEnd
;Custom Functions to replace standard directory chooser with a drive-letter chooser instead
Function CustomCreate
!insertmacro MUI_HEADER_TEXT "Drive Selection" "Choose the drive where you would like to install Portable GIS v5.6. This process will take a VERY LONG time on a USB stick."
!insertmacro MUI_HEADER_TEXT "Drive Selection" "Choose the drive where you would like to install Portable GIS v5.8. This process will take a VERY LONG time on a USB stick."
WriteIniStr '$PLUGINSDIR\custom.ini' 'Settings' 'NumFields' '6'
WriteIniStr '$PLUGINSDIR\custom.ini' 'Field 1' 'Type' 'Label'
WriteIniStr '$PLUGINSDIR\custom.ini' 'Field 1' 'Left' '5'
WriteIniStr '$PLUGINSDIR\custom.ini' 'Field 1' 'Top' '5'
......@@ -104,11 +104,11 @@ Function CustomCreate
WriteIniStr '$PLUGINSDIR\custom.ini' 'Field 1' 'Bottom' '17'
WriteIniStr '$PLUGINSDIR\custom.ini' 'Field 1' 'Text' \
'Select Installation drive:'
StrCpy $R2 0
StrCpy $R0 ''
${GetDrives} "FDD+HDD" GetDrivesCallBack
WriteIniStr '$PLUGINSDIR\custom.ini' 'Field 2' 'Type' 'DropList'
WriteIniStr '$PLUGINSDIR\custom.ini' 'Field 2' 'Left' '30'
WriteIniStr '$PLUGINSDIR\custom.ini' 'Field 2' 'Top' '26'
......@@ -117,7 +117,7 @@ Function CustomCreate
WriteIniStr '$PLUGINSDIR\custom.ini' 'Field 2' 'Flags' 'Notify'
WriteIniStr '$PLUGINSDIR\custom.ini' 'Field 2' 'State' '$R1'
WriteIniStr '$PLUGINSDIR\custom.ini' 'Field 2' 'ListItems' '$R0'
WriteIniStr '$PLUGINSDIR\custom.ini' 'Field 3' 'Type' 'Label'
WriteIniStr '$PLUGINSDIR\custom.ini' 'Field 3' 'Left' '5'
WriteIniStr '$PLUGINSDIR\custom.ini' 'Field 3' 'Top' '109'
......@@ -125,7 +125,7 @@ Function CustomCreate
WriteIniStr '$PLUGINSDIR\custom.ini' 'Field 3' 'Bottom' '119'
WriteIniStr '$PLUGINSDIR\custom.ini' 'Field 3' 'Text' \
'Space required:'
WriteIniStr '$PLUGINSDIR\custom.ini' 'Field 4' 'Type' 'Label'
WriteIniStr '$PLUGINSDIR\custom.ini' 'Field 4' 'Left' '60'
WriteIniStr '$PLUGINSDIR\custom.ini' 'Field 4' 'Top' '109'
......@@ -133,7 +133,7 @@ Function CustomCreate
WriteIniStr '$PLUGINSDIR\custom.ini' 'Field 4' 'Bottom' '119'
WriteIniStr '$PLUGINSDIR\custom.ini' 'Field 4' 'Text' \
'${SIZE} Mb'
WriteIniStr '$PLUGINSDIR\custom.ini' 'Field 5' 'Type' 'Label'
WriteIniStr '$PLUGINSDIR\custom.ini' 'Field 5' 'Left' '5'
WriteIniStr '$PLUGINSDIR\custom.ini' 'Field 5' 'Top' '120'
......@@ -141,7 +141,7 @@ Function CustomCreate
WriteIniStr '$PLUGINSDIR\custom.ini' 'Field 5' 'Bottom' '130'
WriteIniStr '$PLUGINSDIR\custom.ini' 'Field 5' 'Text' \
'Space available:'
WriteIniStr '$PLUGINSDIR\custom.ini' 'Field 6' 'Type' 'Label'
WriteIniStr '$PLUGINSDIR\custom.ini' 'Field 6' 'Left' '60'
WriteIniStr '$PLUGINSDIR\custom.ini' 'Field 6' 'Top' '120'
......@@ -149,13 +149,13 @@ Function CustomCreate
WriteIniStr '$PLUGINSDIR\custom.ini' 'Field 6' 'Bottom' '130'
WriteIniStr '$PLUGINSDIR\custom.ini' 'Field 6' 'Text' \
'$R3 Mb'
push $0
InstallOptions::Dialog '$PLUGINSDIR\custom.ini'
pop $0
pop $0
FunctionEnd
Function CustomLeave
ReadIniStr $0 '$PLUGINSDIR\custom.ini' 'Settings' 'State'
StrCmp $0 '2' 0 next
......@@ -167,12 +167,12 @@ Function CustomLeave
ReadIniStr $0 '$PLUGINSDIR\custom.ini' 'Field 6' 'HWND'
SendMessage $0 ${WM_SETTEXT} 0 'STR:$R3 Mb'
Abort
next:
ReadIniStr $0 '$PLUGINSDIR\custom.ini' 'Field 2' 'State'
StrCpy '$INSTDIR' '$0'
FunctionEnd
Function GetDrivesCallBack
${DriveSpace} "$9" "/D=F /S=M" $R4
IntCmp $R4 '${SIZE}' end end def
......@@ -186,7 +186,7 @@ Function GetDrivesCallBack
end:
Push $0
FunctionEnd
Function .onInit
InitPluginsDir
GetTempFileName $0
......
......@@ -10,7 +10,7 @@
!define MUI_HEADERIMAGE_BITMAP "E:\portablegis_working\ownbrand_multicolour_57x157.bmp" ; optional
!define MUI_ABORTWARNING
!define MUI_ICON "${NSISDIR}\Contrib\Graphics\Icons\modern-install.ico"
;--------------------------------
; Other required files
......@@ -23,14 +23,14 @@
; App-specific definitions
!define SIZE "3300" ;add here total uncompressed data size in Mb of your application
!define APPNAME "Portable GIS v5.6"
!define APPNAME "Portable GIS v5.8"
Name '${APPNAME}'
OutFile 'portablegis_setup_v56.exe'
OutFile 'portablegis_setup_v58.exe'
AllowRootDirInstall true
;--------------------------------
; Pages (generic ones prefixed with insertmacro)
!insertmacro MUI_PAGE_WELCOME
!insertmacro MUI_PAGE_LICENSE "E:\portablegis_working\usbgis\docs\license.txt"
Page Custom CustomCreate CustomLeave
......@@ -51,15 +51,15 @@ Page Custom CustomCreate CustomLeave
!insertmacro MUI_LANGUAGE "English"
;--------------------------------
;--------------------------------
; Installer Sections
Section "primary" SecPrimary
setOutPath $INSTDIR
file /r usbgis
file /oname=portablegis.exe portablegis_ownbrand.exe
file /oname=portablegis.exe portablegis_ownbrand.exe
file portablegis_readme.txt
;Create uninstaller
WriteUninstaller "$INSTDIR\Uninstall.exe"
SectionEnd
......@@ -78,7 +78,7 @@ Section "Uninstall"
SectionEnd
;--------------------------------
;--------------------------------
;Descriptions
;Language strings
......@@ -93,10 +93,10 @@ SectionEnd
;Custom Functions to replace standard directory chooser with a drive-letter chooser instead
Function CustomCreate
!insertmacro MUI_HEADER_TEXT "Drive Selection" "Choose the drive where you would like to install Portable GIS v5.6. This process will take a VERY LONG time on a USB stick."
!insertmacro MUI_HEADER_TEXT "Drive Selection" "Choose the drive where you would like to install Portable GIS v5.8. This process will take a VERY LONG time on a USB stick."
WriteIniStr '$PLUGINSDIR\custom.ini' 'Settings' 'NumFields' '6'
WriteIniStr '$PLUGINSDIR\custom.ini' 'Field 1' 'Type' 'Label'
WriteIniStr '$PLUGINSDIR\custom.ini' 'Field 1' 'Left' '5'
WriteIniStr '$PLUGINSDIR\custom.ini' 'Field 1' 'Top' '5'
......@@ -104,11 +104,11 @@ Function CustomCreate
WriteIniStr '$PLUGINSDIR\custom.ini' 'Field 1' 'Bottom' '17'
WriteIniStr '$PLUGINSDIR\custom.ini' 'Field 1' 'Text' \
'Select Installation drive:'
StrCpy $R2 0
StrCpy $R0 ''
${GetDrives} "FDD+HDD" GetDrivesCallBack
WriteIniStr '$PLUGINSDIR\custom.ini' 'Field 2' 'Type' 'DropList'
WriteIniStr '$PLUGINSDIR\custom.ini' 'Field 2' 'Left' '30'
WriteIniStr '$PLUGINSDIR\custom.ini' 'Field 2' 'Top' '26'
......@@ -117,7 +117,7 @@ Function CustomCreate
WriteIniStr '$PLUGINSDIR\custom.ini' 'Field 2' 'Flags' 'Notify'
WriteIniStr '$PLUGINSDIR\custom.ini' 'Field 2' 'State' '$R1'
WriteIniStr '$PLUGINSDIR\custom.ini' 'Field 2' 'ListItems' '$R0'
WriteIniStr '$PLUGINSDIR\custom.ini' 'Field 3' 'Type' 'Label'
WriteIniStr '$PLUGINSDIR\custom.ini' 'Field 3' 'Left' '5'
WriteIniStr '$PLUGINSDIR\custom.ini' 'Field 3' 'Top' '109'
......@@ -125,7 +125,7 @@ Function CustomCreate
WriteIniStr '$PLUGINSDIR\custom.ini' 'Field 3' 'Bottom' '119'
WriteIniStr '$PLUGINSDIR\custom.ini' 'Field 3' 'Text' \
'Space required:'
WriteIniStr '$PLUGINSDIR\custom.ini' 'Field 4' 'Type' 'Label'
WriteIniStr '$PLUGINSDIR\custom.ini' 'Field 4' 'Left' '60'
WriteIniStr '$PLUGINSDIR\custom.ini' 'Field 4' 'Top' '109'
......@@ -133,7 +133,7 @@ Function CustomCreate
WriteIniStr '$PLUGINSDIR\custom.ini' 'Field 4' 'Bottom' '119'
WriteIniStr '$PLUGINSDIR\custom.ini' 'Field 4' 'Text' \
'${SIZE} Mb'
WriteIniStr '$PLUGINSDIR\custom.ini' 'Field 5' 'Type' 'Label'
WriteIniStr '$PLUGINSDIR\custom.ini' 'Field 5' 'Left' '5'
WriteIniStr '$PLUGINSDIR\custom.ini' 'Field 5' 'Top' '120'
......@@ -141,7 +141,7 @@ Function CustomCreate
WriteIniStr '$PLUGINSDIR\custom.ini' 'Field 5' 'Bottom' '130'
WriteIniStr '$PLUGINSDIR\custom.ini' 'Field 5' 'Text' \
'Space available:'
WriteIniStr '$PLUGINSDIR\custom.ini' 'Field 6' 'Type' 'Label'
WriteIniStr '$PLUGINSDIR\custom.ini' 'Field 6' 'Left' '60'
WriteIniStr '$PLUGINSDIR\custom.ini' 'Field 6' 'Top' '120'
......@@ -149,13 +149,13 @@ Function CustomCreate
WriteIniStr '$PLUGINSDIR\custom.ini' 'Field 6' 'Bottom' '130'
WriteIniStr '$PLUGINSDIR\custom.ini' 'Field 6' 'Text' \
'$R3 Mb'
push $0
InstallOptions::Dialog '$PLUGINSDIR\custom.ini'
pop $0
pop $0
FunctionEnd
Function CustomLeave
ReadIniStr $0 '$PLUGINSDIR\custom.ini' 'Settings' 'State'
StrCmp $0 '2' 0 next
......@@ -167,12 +167,12 @@ Function CustomLeave
ReadIniStr $0 '$PLUGINSDIR\custom.ini' 'Field 6' 'HWND'
SendMessage $0 ${WM_SETTEXT} 0 'STR:$R3 Mb'
Abort
next:
ReadIniStr $0 '$PLUGINSDIR\custom.ini' 'Field 2' 'State'
StrCpy '$INSTDIR' '$0'
FunctionEnd
Function GetDrivesCallBack
${DriveSpace} "$9" "/D=F /S=M" $R4
IntCmp $R4 '${SIZE}' end end def
......@@ -186,7 +186,7 @@ Function GetDrivesCallBack
end:
Push $0
FunctionEnd
Function .onInit
InitPluginsDir
GetTempFileName $0
......
No preview for this file type
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment