[spring] 19/29: New upstream version 104.0+dfsg
Markus Koschany
apo at moszumanska.debian.org
Sat Oct 14 14:54:31 UTC 2017
This is an automated email from the git hooks/post-receive script.
apo pushed a commit to branch master
in repository spring.
commit 9414de336523f1907ca9829cee2e4b81aeea9fea
Author: Markus Koschany <apo at debian.org>
Date: Thu Oct 12 23:27:33 2017 +0200
New upstream version 104.0+dfsg
---
installer/Mac/Info.plist | 24 ---
installer/Mac/spring.icns | Bin 131337 -> 0 bytes
installer/graphics/InstallerIcon.ico | Bin 125395 -> 0 bytes
installer/graphics/InstallerIcon.psd | Bin 857954 -> 0 bytes
installer/graphics/SideBanner.bmp | Bin 154544 -> 0 bytes
installer/graphics/SideBanner.psd | Bin 240813 -> 0 bytes
installer/include/Registry.nsh | 169 ---------------------
installer/include/echo.nsh | 18 ---
installer/include/extractFile.nsh | 14 --
installer/include/fileExistChecks.nsh | 46 ------
installer/include/fileMisc.nsh | 11 --
installer/include/fileassoc.nsh | 119 ---------------
installer/include/getParameterValue.nsh | 228 -----------------------------
installer/make_installer.sh | 48 ------
installer/make_portable_archive.sh | 63 --------
installer/make_uninstall_nsh.py | 89 -----------
installer/nsis_plugins/README.txt | 25 ----
installer/sections/deprecated.nsh | 67 ---------
installer/sections/main.nsh | 65 --------
installer/sections/portable.nsh | 9 --
installer/sections/sectiondesc.nsh | 10 --
installer/sections/setupSections.nsh | 46 ------
installer/sections/shortcuts_desktop.nsh | 9 --
installer/sections/shortcuts_startMenu.nsh | 26 ----
installer/sections/vcredist.nsh | 9 --
installer/spring.nsi | 213 ---------------------------
installer/springsettings.nsh | 21 ---
27 files changed, 1329 deletions(-)
diff --git a/installer/Mac/Info.plist b/installer/Mac/Info.plist
deleted file mode 100644
index 72225e3..0000000
--- a/installer/Mac/Info.plist
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
- <key>CFBundleDisplayName</key>
- <string>Spring RTS</string>
- <key>CFBundleExecutable</key>
- <string>spring</string>
- <key>CFBundleIdentifier</key>
- <string>com.springrts.Spring</string>
- <key>CFBundleName</key>
- <string>Spring RTS</string>
- <key>CFBundlePackageType</key>
- <string>APPL</string>
- <key>CFBundleShortVersionString</key>
- <string>###VERSION###</string>
- <key>CSResourcesFileMapped</key>
- <true/>
- <key>LSRequiresCarbon</key>
- <true/>
- <key>CFBundleIconFile</key>
- <string>spring.icns</string>
-</dict>
-</plist>
diff --git a/installer/Mac/spring.icns b/installer/Mac/spring.icns
deleted file mode 100644
index 89bf6a1..0000000
Binary files a/installer/Mac/spring.icns and /dev/null differ
diff --git a/installer/graphics/InstallerIcon.ico b/installer/graphics/InstallerIcon.ico
deleted file mode 100644
index b4fcf4c..0000000
Binary files a/installer/graphics/InstallerIcon.ico and /dev/null differ
diff --git a/installer/graphics/InstallerIcon.psd b/installer/graphics/InstallerIcon.psd
deleted file mode 100644
index bf598a3..0000000
Binary files a/installer/graphics/InstallerIcon.psd and /dev/null differ
diff --git a/installer/graphics/SideBanner.bmp b/installer/graphics/SideBanner.bmp
deleted file mode 100644
index 37b016f..0000000
Binary files a/installer/graphics/SideBanner.bmp and /dev/null differ
diff --git a/installer/graphics/SideBanner.psd b/installer/graphics/SideBanner.psd
deleted file mode 100644
index 76cb6e2..0000000
Binary files a/installer/graphics/SideBanner.psd and /dev/null differ
diff --git a/installer/include/Registry.nsh b/installer/include/Registry.nsh
deleted file mode 100644
index 91302e6..0000000
--- a/installer/include/Registry.nsh
+++ /dev/null
@@ -1,169 +0,0 @@
-!define registry::Open `!insertmacro registry::Open`
-
-!macro registry::Open _PATH _OPTIONS _HANDLE
- registry::_Open /NOUNLOAD `${_PATH}` `${_OPTIONS}`
- Pop ${_HANDLE}
-!macroend
-
-
-!define registry::Find `!insertmacro registry::Find`
-
-!macro registry::Find _HANDLE _PATH _VALUEORKEY _STRING _TYPE
- registry::_Find /NOUNLOAD `${_HANDLE}`
- Pop ${_PATH}
- Pop ${_VALUEORKEY}
- Pop ${_STRING}
- Pop ${_TYPE}
-!macroend
-
-
-!define registry::Close `!insertmacro registry::Close`
-
-!macro registry::Close _HANDLE
- registry::_Close /NOUNLOAD `${_HANDLE}`
-!macroend
-
-
-!define registry::KeyExists `!insertmacro registry::KeyExists`
-
-!macro registry::KeyExists _PATH _ERR
- registry::_KeyExists /NOUNLOAD `${_PATH}`
- Pop ${_ERR}
-!macroend
-
-
-!define registry::Read `!insertmacro registry::Read`
-
-!macro registry::Read _PATH _VALUE _STRING _TYPE
- registry::_Read /NOUNLOAD `${_PATH}` `${_VALUE}`
- Pop ${_STRING}
- Pop ${_TYPE}
-!macroend
-
-
-!define registry::Write `!insertmacro registry::Write`
-
-!macro registry::Write _PATH _VALUE _STRING _TYPE _ERR
- registry::_Write /NOUNLOAD `${_PATH}` `${_VALUE}` `${_STRING}` `${_TYPE}`
- Pop ${_ERR}
-!macroend
-
-
-!define registry::ReadExtra `!insertmacro registry::ReadExtra`
-
-!macro registry::ReadExtra _PATH _VALUE _NUMBER _STRING _TYPE
- registry::_ReadExtra /NOUNLOAD `${_PATH}` `${_VALUE}` `${_NUMBER}`
- Pop ${_STRING}
- Pop ${_TYPE}
-!macroend
-
-
-!define registry::WriteExtra `!insertmacro registry::WriteExtra`
-
-!macro registry::WriteExtra _PATH _VALUE _STRING _ERR
- registry::_WriteExtra /NOUNLOAD `${_PATH}` `${_VALUE}` `${_STRING}`
- Pop ${_ERR}
-!macroend
-
-
-!define registry::CreateKey `!insertmacro registry::CreateKey`
-
-!macro registry::CreateKey _PATH _ERR
- registry::_CreateKey /NOUNLOAD `${_PATH}`
- Pop ${_ERR}
-!macroend
-
-
-!define registry::DeleteValue `!insertmacro registry::DeleteValue`
-
-!macro registry::DeleteValue _PATH _VALUE _ERR
- registry::_DeleteValue /NOUNLOAD `${_PATH}` `${_VALUE}`
- Pop ${_ERR}
-!macroend
-
-
-!define registry::DeleteKey `!insertmacro registry::DeleteKey`
-
-!macro registry::DeleteKey _PATH _ERR
- registry::_DeleteKey /NOUNLOAD `${_PATH}`
- Pop ${_ERR}
-!macroend
-
-
-!define registry::DeleteKeyEmpty `!insertmacro registry::DeleteKeyEmpty`
-
-!macro registry::DeleteKeyEmpty _PATH _ERR
- registry::_DeleteKeyEmpty /NOUNLOAD `${_PATH}`
- Pop ${_ERR}
-!macroend
-
-
-!define registry::CopyValue `!insertmacro registry::CopyValue`
-
-!macro registry::CopyValue _PATH_SOURCE _VALUE_SOURCE _PATH_TARGET _VALUE_TARGET _ERR
- registry::_CopyValue /NOUNLOAD `${_PATH_SOURCE}` `${_VALUE_SOURCE}` `${_PATH_TARGET}` `${_VALUE_TARGET}`
- Pop ${_ERR}
-!macroend
-
-
-!define registry::MoveValue `!insertmacro registry::MoveValue`
-
-!macro registry::MoveValue _PATH_SOURCE _VALUE_SOURCE _PATH_TARGET _VALUE_TARGET _ERR
- registry::_MoveValue /NOUNLOAD `${_PATH_SOURCE}` `${_VALUE_SOURCE}` `${_PATH_TARGET}` `${_VALUE_TARGET}`
- Pop ${_ERR}
-!macroend
-
-
-!define registry::CopyKey `!insertmacro registry::CopyKey`
-
-!macro registry::CopyKey _PATH_SOURCE _PATH_TARGET _ERR
- registry::_CopyKey /NOUNLOAD `${_PATH_SOURCE}` `${_PATH_TARGET}`
- Pop ${_ERR}
-!macroend
-
-
-!define registry::MoveKey `!insertmacro registry::MoveKey`
-
-!macro registry::MoveKey _PATH_SOURCE _PATH_TARGET _ERR
- registry::_MoveKey /NOUNLOAD `${_PATH_SOURCE}` `${_PATH_TARGET}`
- Pop ${_ERR}
-!macroend
-
-
-!define registry::SaveKey `!insertmacro registry::SaveKey`
-
-!macro registry::SaveKey _PATH _FILE _OPTIONS _ERR
- registry::_SaveKey /NOUNLOAD `${_PATH}` `${_FILE}` `${_OPTIONS}`
- Pop ${_ERR}
-!macroend
-
-
-!define registry::RestoreKey `!insertmacro registry::RestoreKey`
-
-!macro registry::RestoreKey _FILE _ERR
- registry::_RestoreKey /NOUNLOAD `${_FILE}`
- Pop ${_ERR}
-!macroend
-
-
-!define registry::StrToHex `!insertmacro registry::StrToHex`
-
-!macro registry::StrToHex _STRING _HEX_STRING
- registry::_StrToHex /NOUNLOAD `${_STRING}`
- Pop ${_HEX_STRING}
-!macroend
-
-
-!define registry::HexToStr `!insertmacro registry::HexToStr`
-
-!macro registry::HexToStr _HEX_STRING _STRING
- registry::_HexToStr /NOUNLOAD `${_HEX_STRING}`
- Pop ${_STRING}
-!macroend
-
-
-!define registry::Unload `!insertmacro registry::Unload`
-
-!macro registry::Unload
- registry::_Unload
-!macroend
diff --git a/installer/include/echo.nsh b/installer/include/echo.nsh
deleted file mode 100644
index f4c7a34..0000000
--- a/installer/include/echo.nsh
+++ /dev/null
@@ -1,18 +0,0 @@
-; A cross-platform compile-time echo command.
-; This should do what `!echo` is meant to do, but this works under linux.
-
-!macro !compile_time_echo _MSG
- !ifdef NSIS_WIN32_MAKENSIS
- ; Windows - cmd.exe
- !system 'echo ${_MSG}'
- !else
- ; Posix - sh
- !system 'echo "${_MSG}"'
- !endif
-!macroend
-!define !echonow "!insertmacro !compile_time_echo"
-
-
-; Usage:
-;${!echonow} "Packaging the installer now ..."
-
diff --git a/installer/include/extractFile.nsh b/installer/include/extractFile.nsh
deleted file mode 100644
index aa1f7e1..0000000
--- a/installer/include/extractFile.nsh
+++ /dev/null
@@ -1,14 +0,0 @@
-
-; install .7z instdir + extract + delete .7z
-
-!macro extractFile filename tempfile path
- File /oname=${tempfile} "${filename}"
- ${If} "${path}" != ""
- SetOutPath "$INSTDIR\${path}"
- ${EndIf}
- Nsis7z::Extract "$INSTDIR\${tempfile}"
- ${If} "${path}" != ""
- SetOutPath "$INSTDIR"
- ${EndIf}
- Delete "$INSTDIR\${tempfile}"
-!macroend
diff --git a/installer/include/fileExistChecks.nsh b/installer/include/fileExistChecks.nsh
deleted file mode 100644
index 2b5eeb3..0000000
--- a/installer/include/fileExistChecks.nsh
+++ /dev/null
@@ -1,46 +0,0 @@
-; See http://nsis.sourceforge.net/Check_if_a_file_exists_at_compile_time for documentation
-
-!macro !defineiffileexists _VAR_NAME _FILE_NAME
- !tempfile _TEMPFILE
- !ifdef NSIS_WIN32_MAKENSIS
- ; Windows - cmd.exe
- !system 'if exist "${_FILE_NAME}" echo !define ${_VAR_NAME} > "${_TEMPFILE}"'
- !else
- ; Posix - sh
- !system 'if [ -e "$(echo "${_FILE_NAME}" | sed -e "s_\\_\/_g")" ]; then echo "!define ${_VAR_NAME}" > "${_TEMPFILE}"; fi'
- !endif
- !include '${_TEMPFILE}'
- !delfile '${_TEMPFILE}'
- !undef _TEMPFILE
-!macroend
-!define !defineiffileexists "!insertmacro !defineiffileexists"
-
-
-!macro !defineifdirexists _VAR_NAME _FILE_NAME
- !tempfile _TEMPFILE
- !ifdef NSIS_WIN32_MAKENSIS
- ; Windows - cmd.exe
- !system 'if exist "${_FILE_NAME}\*.*" echo !define ${_VAR_NAME} > "${_TEMPFILE}"'
- !else
- ; Posix - sh
- !system 'if [ -d "$(echo "${_FILE_NAME}" | sed -e "s_\\_\/_g")" ]; then echo "!define ${_VAR_NAME}" > "${_TEMPFILE}"; fi'
- !endif
- !include '${_TEMPFILE}'
- !delfile '${_TEMPFILE}'
- !undef _TEMPFILE
-!macroend
-!define !defineifdirexists "!insertmacro !defineifdirexists"
-
-
-; Usage:
-;${!defineiffileexists} FILE_EXISTS ".\to\check\file.txt"
-;!ifdef FILE_EXISTS
-; !system 'echo "The file exists!"'
-; !undef FILE_EXISTS
-;!endif
-;
-;${!defineifdirexists} DIR_EXISTS ".\to\check\dir"
-;!ifdef DIR_EXISTS
-; !system 'echo "The dir exists!"'
-; !undef DIR_EXISTS
-;!endif
diff --git a/installer/include/fileMisc.nsh b/installer/include/fileMisc.nsh
deleted file mode 100644
index 0058bd2..0000000
--- a/installer/include/fileMisc.nsh
+++ /dev/null
@@ -1,11 +0,0 @@
-
-!macro createemptyfile _FILE_NAME
- ClearErrors
- FileOpen $0 ${_FILE_NAME} w
- IfErrors +3
- FileWrite $0 ""
- FileClose $0
-!macroend
-
-; Usage:
-;!insertmacro createemptyfile "$INSTDIR\template.txt"
diff --git a/installer/include/fileassoc.nsh b/installer/include/fileassoc.nsh
deleted file mode 100644
index e216bfc..0000000
--- a/installer/include/fileassoc.nsh
+++ /dev/null
@@ -1,119 +0,0 @@
-; fileassoc.nsh
-; File association helper macros
-; Written by Saivert
-;
-; Features automatic backup system and UPDATEFILEASSOC macro for
-; shell change notification.
-;
-; |> How to use <|
-; To associate a file with an application so you can double-click it in explorer, use
-; the APP_ASSOCIATE macro like this:
-;
-; Example:
-; !insertmacro APP_ASSOCIATE "txt" "myapp.textfile" "$INSTDIR\myapp.exe,0" \
-; "Open with myapp" "$INSTDIR\myapp.exe $\"%1$\""
-;
-; Never insert the APP_ASSOCIATE macro multiple times, it is only ment
-; to associate an application with a single file and using the
-; the "open" verb as default. To add more verbs (actions) to a file
-; use the APP_ASSOCIATE_ADDVERB macro.
-;
-; Example:
-; !insertmacro APP_ASSOCIATE_ADDVERB "myapp.textfile" "edit" "Edit with myapp" \
-; "$INSTDIR\myapp.exe /edit $\"%1$\""
-;
-; To have access to more options when registering the file association use the
-; APP_ASSOCIATE_EX macro. Here you can specify the verb and what verb is to be the
-; standard action (default verb).
-;
-; And finally: To remove the association from the registry use the APP_UNASSOCIATE
-; macro. Here is another example just to wrap it up:
-; !insertmacro APP_UNASSOCIATE "txt" "myapp.textfile"
-;
-; |> Note <|
-; When defining your file class string always use the short form of your application title
-; then a period (dot) and the type of file. This keeps the file class sort of unique.
-; Examples:
-; Winamp.Playlist
-; NSIS.Script
-; Photoshop.JPEGFile
-;
-; |> Tech info <|
-; The registry key layout for a file association is:
-; HKEY_CLASSES_ROOT
-; <applicationID> = <"description">
-; shell
-; <verb> = <"menu-item text">
-; command = <"command string">
-;
-
-!macro APP_ASSOCIATE EXT FILECLASS DESCRIPTION ICON COMMANDTEXT COMMAND
- ; Backup the previously associated file class
- ReadRegStr $R0 HKCR ".${EXT}" ""
- WriteRegStr HKCR ".${EXT}" "${FILECLASS}_backup" "$R0"
-
- WriteRegStr HKCR ".${EXT}" "" "${FILECLASS}"
-
- WriteRegStr HKCR "${FILECLASS}" "" `${DESCRIPTION}`
- WriteRegStr HKCR "${FILECLASS}\DefaultIcon" "" `${ICON}`
- WriteRegStr HKCR "${FILECLASS}\shell" "" "open"
- WriteRegStr HKCR "${FILECLASS}\shell\open" "" `${COMMANDTEXT}`
- WriteRegStr HKCR "${FILECLASS}\shell\open\command" "" `${COMMAND}`
-!macroend
-
-!macro APP_ASSOCIATE_EX EXT FILECLASS DESCRIPTION ICON VERB DEFAULTVERB SHELLNEW COMMANDTEXT COMMAND
- ; Backup the previously associated file class
- ReadRegStr $R0 HKCR ".${EXT}" ""
- WriteRegStr HKCR ".${EXT}" "${FILECLASS}_backup" "$R0"
-
- WriteRegStr HKCR ".${EXT}" "" "${FILECLASS}"
- StrCmp "${SHELLNEW}" "0" +2
- WriteRegStr HKCR ".${EXT}\ShellNew" "NullFile" ""
-
- WriteRegStr HKCR "${FILECLASS}" "" `${DESCRIPTION}`
- WriteRegStr HKCR "${FILECLASS}\DefaultIcon" "" `${ICON}`
- WriteRegStr HKCR "${FILECLASS}\shell" "" `${DEFAULTVERB}`
- WriteRegStr HKCR "${FILECLASS}\shell\${VERB}" "" `${COMMANDTEXT}`
- WriteRegStr HKCR "${FILECLASS}\shell\${VERB}\command" "" `${COMMAND}`
-!macroend
-
-!macro APP_ASSOCIATE_ADDVERB FILECLASS VERB COMMANDTEXT COMMAND
- WriteRegStr HKCR "${FILECLASS}\shell\${VERB}" "" `${COMMANDTEXT}`
- WriteRegStr HKCR "${FILECLASS}\shell\${VERB}\command" "" `${COMMAND}`
-!macroend
-
-!macro APP_ASSOCIATE_REMOVEVERB FILECLASS VERB
- DeleteRegKey HKCR `${FILECLASS}\shell\${VERB}`
-!macroend
-
-
-!macro APP_UNASSOCIATE EXT FILECLASS
- ; Backup the previously associated file class
- ReadRegStr $R0 HKCR ".${EXT}" `${FILECLASS}_backup`
- WriteRegStr HKCR ".${EXT}" "" "$R0"
-
- DeleteRegKey HKCR `${FILECLASS}`
-!macroend
-
-!macro APP_ASSOCIATE_GETFILECLASS OUTPUT EXT
- ReadRegStr ${OUTPUT} HKCR ".${EXT}" ""
-!macroend
-
-
-; !defines for use with SHChangeNotify
-!ifdef SHCNE_ASSOCCHANGED
-!undef SHCNE_ASSOCCHANGED
-!endif
-!define SHCNE_ASSOCCHANGED 0x08000000
-!ifdef SHCNF_FLUSH
-!undef SHCNF_FLUSH
-!endif
-!define SHCNF_FLUSH 0x1000
-
-!macro UPDATEFILEASSOC
-; Using the system.dll plugin to call the SHChangeNotify Win32 API function so we
-; can update the shell.
- System::Call "shell32::SHChangeNotify(i,i,i,i) (${SHCNE_ASSOCCHANGED}, ${SHCNF_FLUSH}, 0, 0)"
-!macroend
-
-;EOF
\ No newline at end of file
diff --git a/installer/include/getParameterValue.nsh b/installer/include/getParameterValue.nsh
deleted file mode 100644
index 6a8bac0..0000000
--- a/installer/include/getParameterValue.nsh
+++ /dev/null
@@ -1,228 +0,0 @@
-; returns DefaultValue or "" if parameter is found
-; "" if not
-!define getParameterValue "!insertmacro getParameterValue"
-!macro getParameterValue Parameter DefaultValue
- Push ${Parameter}
- Push ${DefaultValue}
- Call getParameterValue
-!macroend
-
-; Retrieved from http://nsis.sourceforge.net/Get_command_line_parameters
-; GetParameters
-; input, none
-; output, top of stack (replaces, with e.g. whatever)
-; modifies no other variables.
-
-Function GetParameters
-
- Push $R0
- Push $R1
- Push $R2
- Push $R3
-
- StrCpy $R2 1
- StrLen $R3 $CMDLINE
-
- ;Check for quote or space
- StrCpy $R0 $CMDLINE $R2
- StrCmp $R0 '"' 0 +3
- StrCpy $R1 '"'
- Goto loop
- StrCpy $R1 " "
-
- loop:
- IntOp $R2 $R2 + 1
- StrCpy $R0 $CMDLINE 1 $R2
- StrCmp $R0 $R1 get
- StrCmp $R2 $R3 get
- Goto loop
-
- get:
- IntOp $R2 $R2 + 1
- StrCpy $R0 $CMDLINE 1 $R2
- StrCmp $R0 " " get
- StrCpy $R0 $CMDLINE "" $R2
-
- Pop $R3
- Pop $R2
- Pop $R1
- Exch $R0
-
-FunctionEnd
-
-; Retrieved from http://nsis.sourceforge.net/StrStr
-!define StrStr "!insertmacro StrStr"
-
-!macro StrStr ResultVar String SubString
- Push `${String}`
- Push `${SubString}`
- Call StrStr
- Pop `${ResultVar}`
-!macroend
-
-Function StrStr
-/*After this point:
- ------------------------------------------
- $R0 = SubString (input)
- $R1 = String (input)
- $R2 = SubStringLen (temp)
- $R3 = StrLen (temp)
- $R4 = StartCharPos (temp)
- $R5 = TempStr (temp)*/
-
- ;Get input from user
- Exch $R0
- Exch
- Exch $R1
- Push $R2
- Push $R3
- Push $R4
- Push $R5
-
- ;Get "String" and "SubString" length
- StrLen $R2 $R0
- StrLen $R3 $R1
- ;Start "StartCharPos" counter
- StrCpy $R4 0
-
- ;Loop until "SubString" is found or "String" reaches its end
- loop:
- ;Remove everything before and after the searched part ("TempStr")
- StrCpy $R5 $R1 $R2 $R4
-
- ;Compare "TempStr" with "SubString"
- StrCmp $R5 $R0 done
- ;If not "SubString", this could be "String"'s end
- IntCmp $R4 $R3 done 0 done
- ;If not, continue the loop
- IntOp $R4 $R4 + 1
- Goto loop
- done:
-
-/*After this point:
- ------------------------------------------
- $R0 = ResultVar (output)*/
-
- ;Remove part before "SubString" on "String" (if there has one)
- StrCpy $R0 $R1 `` $R4
-
- ;Return output to user
- Pop $R5
- Pop $R4
- Pop $R3
- Pop $R2
- Pop $R1
- Exch $R0
-FunctionEnd
-
-; http://nsis.sourceforge.net/Get_command_line_parameter_by_name
-; getParameterValue
-; Chris Morgan<cmorgan at alum.wpi.edu> 5/10/2004
-; -Updated 4/7/2005 to add support for retrieving a command line switch
-; and additional documentation
-;
-; Searches the command line input, retrieved using GetParameters, for the
-; value of an option given the option name. If no option is found the
-; default value is placed on the top of the stack upon function return.
-;
-; This function can also be used to detect the existence of just a
-; command line switch like /OUTPUT Pass the default and "OUTPUT"
-; on the stack like normal. An empty return string "" will indicate
-; that the switch was found, the default value indicates that
-; neither a parameter or switch was found.
-;
-; Inputs - Top of stack is default if parameter isn't found,
-; second in stack is parameter to search for, ex. "OUTPUT"
-; Outputs - Top of the stack contains the value of this parameter
-; So if the command line contained /OUTPUT=somedirectory, "somedirectory"
-; will be on the top of the stack when this function returns
-;
-; Register usage
-;$R0 - default return value if the parameter isn't found
-;$R1 - input parameter, for example OUTPUT from the above example
-;$R2 - the length of the search, this is the search parameter+2
-; as we have '/OUTPUT='
-;$R3 - the command line string
-;$R4 - result from StrStr calls
-;$R5 - search for ' ' or '"'
-
-Function getParameterValue
- Exch $R0 ; get the top of the stack(default parameter) into R0
- Exch ; exchange the top of the stack(default) with
- ; the second in the stack(parameter to search for)
- Exch $R1 ; get the top of the stack(search parameter) into $R1
-
- ;Preserve on the stack the registers used in this function
- Push $R2
- Push $R3
- Push $R4
- Push $R5
-
- Strlen $R2 $R1+2 ; store the length of the search string into R2
-
- Call GetParameters ; get the command line parameters
- Pop $R3 ; store the command line string in R3
-
- # search for quoted search string
- StrCpy $R5 '"' ; later on we want to search for a open quote
- Push $R3 ; push the 'search in' string onto the stack
- Push '"/$R1=' ; push the 'search for'
- Call StrStr ; search for the quoted parameter value
- Pop $R4
- StrCpy $R4 $R4 "" 1 ; skip over open quote character, "" means no maxlen
- StrCmp $R4 "" "" next ; if we didn't find an empty string go to next
-
- # search for non-quoted search string
- StrCpy $R5 ' ' ; later on we want to search for a space since we
- ; didn't start with an open quote '"' we shouldn't
- ; look for a close quote '"'
- Push $R3 ; push the command line back on the stack for searching
- Push '/$R1=' ; search for the non-quoted search string
- Call StrStr
- Pop $R4
-
- ; $R4 now contains the parameter string starting at the search string,
- ; if it was found
-next:
- StrCmp $R4 "" check_for_switch ; if we didn't find anything then look for
- ; usage as a command line switch
- # copy the value after /$R1= by using StrCpy with an offset of $R2,
- # the length of '/OUTPUT='
- StrCpy $R0 $R4 "" $R2 ; copy commandline text beyond parameter into $R0
- # search for the next parameter so we can trim this extra text off
- Push $R0
- Push $R5 ; search for either the first space ' ', or the first
- ; quote '"'
- ; if we found '"/output' then we want to find the
- ; ending ", as in '"/output=somevalue"'
- ; if we found '/output' then we want to find the first
- ; space after '/output=somevalue'
- Call StrStr ; search for the next parameter
- Pop $R4
- StrCmp $R4 "" done ; if 'somevalue' is missing, we are done
- StrLen $R4 $R4 ; get the length of 'somevalue' so we can copy this
- ; text into our output buffer
- StrCpy $R0 $R0 -$R4 ; using the length of the string beyond the value,
- ; copy only the value into $R0
- goto done ; if we are in the parameter retrieval path skip over
- ; the check for a command line switch
-
-; See if the parameter was specified as a command line switch, like '/output'
-check_for_switch:
- Push $R3 ; push the command line back on the stack for searching
- Push '/$R1' ; search for the non-quoted search string
- Call StrStr
- Pop $R4
- StrCmp $R4 "" done ; if we didn't find anything then use the default
- StrCpy $R0 "" ; otherwise copy in an empty string since we found the
- ; parameter, just didn't find a value
-
-done:
- Pop $R5
- Pop $R4
- Pop $R3
- Pop $R2
- Pop $R1
- Exch $R0 ; put the value in $R0 at the top of the stack
-FunctionEnd
-
diff --git a/installer/make_installer.sh b/installer/make_installer.sh
deleted file mode 100755
index 74ce076..0000000
--- a/installer/make_installer.sh
+++ /dev/null
@@ -1,48 +0,0 @@
-#! /bin/bash
-
-# Quit on error.
-set -e
-
-if [ ! -e installer ]; then
- echo "Error: This script needs to be run from the root directory of the archive"
- exit 1
-fi
-WGET="wget -N --cache=off"
-
-TAG=$(git describe --tags|tr -d '\n')
-
-if [ "$TAG" = "" ]; then
- echo "Error running git describe"
- exit 1
-fi
-NSISDEFINES="-DVERSION_TAG="$TAG""
-
-# Evaluate the engines version
-if ! git describe --candidate=0 --tags 2>/dev/null; then
- NSISDEFINES="$NSISDEFINES -DTEST_BUILD"
- echo "Creating test installer for revision $TAG"
-fi
-
-mkdir -p installer/downloads
-cd installer/downloads
-
-if ! [ -s vcredist_x86.exe ]; then
- $WGET http://download.microsoft.com/download/e/1/c/e1c773de-73ba-494a-a5ba-f24906ecf088/vcredist_x86.exe
-fi
-
-if [ ! -s spring_testing_minimal-portable.7z ]; then
- echo "Warning: spring_testing_minimal-portable.7z didn't exist, downloading..." >&2
- $WGET https://springrts.com/dl/buildbot/default/master/spring_testing_minimal-portable.7z
-fi
-
-cd ../..
-
-#create uninstall.nsh
-installer/make_uninstall_nsh.py installer/downloads/spring_testing_minimal-portable.7z >installer/downloads/uninstall.nsh
-
-
-makensis -V3 $NSISDEFINES $@ -DNSI_UNINSTALL_FILES=downloads/uninstall.nsh \
--DMIN_PORTABLE_ARCHIVE=downloads/spring_testing_minimal-portable.7z \
--DVCREDIST=downloads/vcredist_x86.exe \
- installer/spring.nsi
-
diff --git a/installer/make_portable_archive.sh b/installer/make_portable_archive.sh
deleted file mode 100755
index 41bcad2..0000000
--- a/installer/make_portable_archive.sh
+++ /dev/null
@@ -1,63 +0,0 @@
-#!/bin/bash
-
-set -e
-
-if [ $# -lt 1 ]; then
- echo "Usage: $0 <spring_VERSION.exe> <outputpath>"
- exit
-fi
-
-# check req.
-`which wine &> /dev/null` || (echo "Error: You need wine installed!"; exit)
-`which winepath &> /dev/null` || (echo "Error: You need winepath installed!"; exit)
-`which 7z &> /dev/null` || (echo "Error: You need 7z installed!"; exit)
-
-
-# prepare
-INSTALLER=$1
-OUTPUTPATH=$2
-
-if [ -n ${OUTPUTPATH} ]; then
- if [ ! -d ${OUTPUTPATH} ]; then
- echo "${OUTPUTPATH} doesn't exist!"
- exit 1
- fi
- OUTPUTPATH="${OUTPUTPATH}/"
-fi
-
-VERSION=`basename ${INSTALLER} .exe`
-VERSION=${VERSION:7}
-echo ${VERSION} detected
-TEMPDIR=`mktemp -d`
-
-echo Temporary directory: ${TEMPDIR}
-
-# create a tempdir
-PATHNAME=spring-${VERSION}
-INSTPATH=${TEMPDIR}/${PATHNAME}
-mkdir -p "${INSTPATH}"
-
-# detect wine `windows` peth of the tempdir
-WINEINSTPATH=`winepath -w "${INSTPATH}"`
-if [ "${WINEINSTPATH:0:4}" = "\\\\?\\" ]; then
- echo "Error: Couldn't translate tempdir path"
- exit
-fi
-
-# make the path passable via linux bash \ -> \\
-WINEINSTPATH="${WINEINSTPATH//\\/\\\\}"
-
-# install in tempdir via wine
-INSTCOMMAND="wine ${INSTALLER} /S /PORTABLE /NOREGISTRY /NODESKTOPLINK /NOSTARTMENU /D=$WINEINSTPATH"
-echo $INSTCOMMAND
-
-if ! sh -c "$INSTCOMMAND" ; then
- echo "Error: Installation failed"
- exit
-fi
-
-# compress
-7z a -t7z -m0=lzma -mx=9 -mfb=64 -md=64m -ms=on ${OUTPUTPATH}spring_${VERSION}_portable.7z ${INSTPATH}
-
-rm -rf ${TEMPDIR}
-
diff --git a/installer/make_uninstall_nsh.py b/installer/make_uninstall_nsh.py
deleted file mode 100755
index 57e872f..0000000
--- a/installer/make_uninstall_nsh.py
+++ /dev/null
@@ -1,89 +0,0 @@
-#!/usr/bin/env python
-#
-# this scripts creates an nullsoft script that removes files for a given .7z archive
-# python {this_script}.py > installer/sections/luaui.nsh
-#
-# @param baseDir for example: "/home/userX/src/spring"
-#
-
-
-from __future__ import print_function
-import subprocess, sys
-
-def uniquify(list):
- checked = []
- for e in list:
- if e not in checked:
- checked.append(e)
- return checked
-
-def toWinPath(path):
- return path.replace('/', '\\')
-
-def parseArgv(argv):
- prefix=""
- config = argv.split(":")
- if len(config)==2:
- prefix=config[1]
- return config[0], prefix
-
-def sortPaths(argv):
- argv.sort(key=lambda x: x.count("\\"), reverse=True)
- return argv
-
-
-def getContents(archives):
- """
- parses the output of 7z for file and returns a list of files/paths found inside it
- """
- paths=[]
- files=[]
- for archive in archives:
- path, prefix=parseArgv(archive)
- output=str(subprocess.check_output(["7z","l","-slt", path]))
- lines=output.split("\n")
- if (len(lines)==1): # python 3 hack
- lines = output.split("\\n")
- for line in lines:
- isdir=False
- if line.startswith('Path = '):
- path=line[7:]
- if line.startswith('Attributes = '):
- if line[13]=='D':
- paths.append(toWinPath(prefix+path))
- else:
- files.append(toWinPath(prefix+path))
-
- return uniquify(files), uniquify(paths)
-
-def writeNsh(files, paths, argv):
- """
- writes uninstall cmds for files + paths into the file nsh
- """
- print("; This file is automaticly created, don't edit it!")
- command="make_uninstall_nsh.py"
- for arg in argv:
- command=command+" " +arg
-
- print("; created with: %s" % command)
- print(";")
- for file in files:
- print('Delete "$INSTDIR\%s"'%(file))
- for path in paths:
- print('RmDir "$INSTDIR\%s"'%(path))
- for archive in argv:
- path, prefix = parseArgv(archive)
- if prefix!="":
- #strip backslash at the end
- if prefix.endswith("\\"):
- prefix=prefix[:-1]
- print('RmDir "$INSTDIR\%s"'%(prefix))
-
-
-if len(sys.argv)<2:
- print("Usage %s [<7z archive>[:<subpath to extract]]+"%(sys.argv[0]), file=sys.stderr)
- sys.exit(1)
-else:
- files, paths = getContents(sys.argv[1:])
- writeNsh(files, sortPaths(paths), sys.argv[1:])
-
diff --git a/installer/nsis_plugins/README.txt b/installer/nsis_plugins/README.txt
deleted file mode 100644
index c7fd4f6..0000000
--- a/installer/nsis_plugins/README.txt
+++ /dev/null
@@ -1,25 +0,0 @@
-# NSIS Plugins
-
-## FindProcDLL
-File: `FindProcDLL.dll`
-License: <unknown> (sources freely available)
-Page: http://nsis.sourceforge.net/FindProcDLL_plug-in
-Description: Allows one to find running processes
-
-## Inetc
-File: `inetc.dll`
-License: <unknown> (sources freely available)
-Page: http://nsis.sourceforge.net/Inetc_plug-in
-Description: Allows one to download and upload files from and to the itnernet.
-
-## Nsis7z
-File: `nsis7z.dll`
-License: LGPL
-Page: http://nsis.sourceforge.net/Nsis7z_plug-in
-Description: Allows one to extract archives in any of the 7zip supported algorithms
-
-## Registry
-File: `registry.dll`
-License: <unknown> (sources freely available)
-Page: http://nsis.sourceforge.net/Registry_plug-in
-Description: Allows one to read from and write to the Windows Registry
diff --git a/installer/sections/deprecated.nsh b/installer/sections/deprecated.nsh
deleted file mode 100644
index ad92947..0000000
--- a/installer/sections/deprecated.nsh
+++ /dev/null
@@ -1,67 +0,0 @@
-!ifdef INSTALL
- ; 99.0
- Delete "$INSTDIR\Zero-K.exe"
- Delete "$SMPROGRAMS\${PRODUCT_NAME}\Zero-K Lobby.lnk"
- Delete "$DESKTOP\Spring lobby-client Zero-K.lnk"
-
- ; 95.0
- Delete "$SMPROGRAMS\${PRODUCT_NAME}\Test Spring MT.lnk"
- Delete "$SMPROGRAMS\${PRODUCT_NAME}\Test Spring MT (safemode).lnk"
- Delete "$INSTDIR\spring-multithreaded.exe"
-
- ; Old DLLs, not needed anymore
- ; (python upgraded to 25)
- Delete "$INSTDIR\python24.dll"
-
- Delete "$INSTDIR\settingstemplate.xml"
-
- ; Remove Luxi.ttf, it has been replaced by FreeSansBold
- Delete "$INSTDIR\Luxi.ttf"
- Delete "$INSTDIR\fonts\Luxi.ttf"
-
- ; Remove SelectionEditor, it has been integrated into SpringLobby and SpringSettings
- Delete "$INSTDIR\SelectionEditor.exe"
- Delete "$INSTDIR\MSVCP71.dll"
- Delete "$INSTDIR\zlibwapi.dll"
-
- ; Purge old file from 0.75 install.
- Delete "$INSTDIR\LuaUI\unitdefs.lua"
-
- ; next one is deprecated since mingwlibs 20.1 (around spring v0.81.2.1)
- Delete "$INSTDIR\wrap_oal.dll"
- Delete "$INSTDIR\cache\ArchiveCacheV9.lua"
-
- Delete "$INSTDIR\SpringDownloader.exe"
- Delete "$INSTDIR\springfiles.url"
- Delete "$INSTDIR\ArchiveCacheV7.lua"
-
- ; zero-k lobby icon
- Delete "$INSTDIR\Zero-K.ico"
-
- RmDir "$INSTDIR\mods"
-
- ; Demofile file association (with multiengine support this doesn't work as current spring can't run old demos)
- !insertmacro APP_UNASSOCIATE "sdf" "spring.demofile"
-
- ; deprecated Shortcuts
- Delete "$SMPROGRAMS\${PRODUCT_NAME}\Uninstall.lnk"
- Delete "$SMPROGRAMS\${PRODUCT_NAME}\Website.lnk"
- Delete "$SMPROGRAMS\${PRODUCT_NAME}\Spring test.lnk"
- Delete "$SMPROGRAMS\${PRODUCT_NAME}\Spring multiplayer battleroom.lnk"
- Delete "$SMPROGRAMS\${PRODUCT_NAME}\Selectionkeys editor.lnk"
- Delete "$SMPROGRAMS\${PRODUCT_NAME}\Update CA.lnk"
- Delete "$SMPROGRAMS\${PRODUCT_NAME}\rapid-GUI.lnk"
- Delete "$SMPROGRAMS\${PRODUCT_NAME}\Settings.lnk"
-
-
- Delete "$SMPROGRAMS\${PRODUCT_NAME}\SpringDownloader.lnk"
- Delete "$SMPROGRAMS\${PRODUCT_NAME}\Spring Website.lnk"
- Delete "$SMPROGRAMS\${PRODUCT_NAME}\Download Content.lnk"
- Delete "$SMPROGRAMS\${PRODUCT_NAME}\Readme.lnk"
-
- Delete "$INSTDIR\Spring.url"
- Delete "$INSTDIR\springfiles.url"
-
- Delete "$DESKTOP\Zero-K Lobby.lnk"
-
-!endif
diff --git a/installer/sections/main.nsh b/installer/sections/main.nsh
deleted file mode 100644
index 6970183..0000000
--- a/installer/sections/main.nsh
+++ /dev/null
@@ -1,65 +0,0 @@
-!ifdef INSTALL
-
- SetOutPath "$INSTDIR"
- SetOverWrite on
-
- ${If} ${FileExists} "$INSTDIR\uninst.exe"
- MessageBox MB_ICONINFORMATION|MB_YESNO "Spring is already installed in this directory, do you want to uninstall it before continuing?" /SD IDYES IDNO fail
- ExecWait '"$INSTDIR\uninst.exe" /S _?=$INSTDIR' $0
- ${If} $0 != 0
- fail:
- Abort "Uninstallation failed, please choose a different installation Directory or cleanup the destination directory."
- ${EndIf}
- ${EndIf}
-
- ${!echonow} "Processing: engine"
-
- !insertmacro extractFile "${MIN_PORTABLE_ARCHIVE}" "spring_engine.7z" ""
-
- CreateDirectory "$INSTDIR\maps"
- CreateDirectory "$INSTDIR\games"
-
- ${!echonow} "Processing: main: demo file association"
- ${If} $REGISTRY = 1
- ; we don't add here $INSTDIR directly to registry, because file-structure will change in future
- ; please use this values directly without modifying them
- WriteRegStr ${PRODUCT_ROOT_KEY} ${PRODUCT_KEY} "SpringEngineHelper" "$INSTDIR\unitsync.dll"
- WriteRegStr ${PRODUCT_ROOT_KEY} ${PRODUCT_KEY} "SpringEngine" "$INSTDIR\spring.exe"
-
- ; link custom spring:// scheme, so we can start spring from browser
- WriteRegStr HKCR "spring" "" "URL:Spring Protocol"
- WriteRegStr HKCR "spring" "URL Protocol" ""
- WriteRegStr HKCR "spring\DefaultIcon" "" "spring.exe,1"
- WriteRegStr HKCR "spring\shell\open\command" "" "$INSTDIR\spring.exe %1"
- ${EndIf}
-
-!else
- ${!echonow} "Processing: main: Uninstall"
-
- ; Generated stuff from the installer
- Delete "$INSTDIR\${PRODUCT_NAME}.url"
- Delete "$INSTDIR\uninst.exe"
-
- ; Generated stuff from running spring
- Delete "$INSTDIR\cache\ArchiveCache.lua"
- Delete "$INSTDIR\unitsync.log"
- Delete "$INSTDIR\infolog.txt"
- Delete "$INSTDIR\ext.txt"
- RmDir "$INSTDIR\demos"
- RmDir "$INSTDIR\maps"
- RmDir "$INSTDIR\games"
-
- ; Registry Keys
- DeleteRegKey ${PRODUCT_ROOT_KEY} ${PRODUCT_KEY}
- DeleteRegKey HKCR "spring"
-
- MessageBox MB_YESNO|MB_ICONQUESTION "Do you want me to completely remove all spring related files?$\n\
- All maps, games, screenshots and your settings will be removed. $\n\
- CAREFULL: ALL CONTENTS OF YOUR SPRING INSTALLATION DIRECTORY WILL BE REMOVED! " \
- /SD IDNO IDNO skip_purge
- RmDir /r "$INSTDIR"
- RmDir /r "$DOCUMENTS\My Games\Spring"
- Delete "$LOCALAPPDATA\springsettings.cfg"
- skip_purge:
-
-!endif
diff --git a/installer/sections/portable.nsh b/installer/sections/portable.nsh
deleted file mode 100644
index 2e36474..0000000
--- a/installer/sections/portable.nsh
+++ /dev/null
@@ -1,9 +0,0 @@
-!ifdef INSTALL
-
- SetOutPath "$INSTDIR"
-
-!else
-
- Delete "$INSTDIR\springsettings.cfg"
-
-!endif
diff --git a/installer/sections/sectiondesc.nsh b/installer/sections/sectiondesc.nsh
deleted file mode 100644
index 47a6683..0000000
--- a/installer/sections/sectiondesc.nsh
+++ /dev/null
@@ -1,10 +0,0 @@
-; Section descriptions
-!insertmacro MUI_FUNCTION_DESCRIPTION_BEGIN
- !insertmacro MUI_DESCRIPTION_TEXT ${SEC_MAIN} "The core components required to run Spring. This includes the configuration utilities.$\n$\nNote: This section is required and cannot be deselected."
-
- !insertmacro MUI_DESCRIPTION_TEXT ${SEC_START} "This creates shortcuts on the start menu to all the applications provided."
-
- !insertmacro MUI_DESCRIPTION_TEXT ${SEC_PORTABLE} "This will keep all the configuration local to the install dir. Use when installing on a pen-drive, for example."
- !insertmacro MUI_DESCRIPTION_TEXT ${SEC_DESKTOP} "This creates a shortcut on the desktop to the multiplayer battleroom for quick access to multiplayer games."
-
-!insertmacro MUI_FUNCTION_DESCRIPTION_END
diff --git a/installer/sections/setupSections.nsh b/installer/sections/setupSections.nsh
deleted file mode 100644
index 4fcd80b..0000000
--- a/installer/sections/setupSections.nsh
+++ /dev/null
@@ -1,46 +0,0 @@
-;
-; Allows toggeling sections by command line switch (mainly for unattened installations)
-; all possible parameters are behind ${toggleSection}
-; for example:
-; ${toggleSection} "PORTABLE" ${SEC_PORTABLE}
-; is the /PORTABLE switch
-
-System::Store "s" ; save all register
-
-!define toggleSection "!insertmacro toggleSection"
-!macro toggleSection ParameterName Section
- ${getParameterValue} ${ParameterName} "false"
- Pop $0
- ${If} $0 == ""
- SectionGetFlags ${Section} $1 ; get current flags
- IntOp $1 $1 & ${SF_SELECTED}
- ${If} $1 = ${SF_SELECTED} ; selected?
- IntOp $1 $1 - ${SF_SELECTED} ; unselect
- ${Else}
- IntOp $1 $1 | ${SF_SELECTED} ; select
- ${Endif}
- SectionSetFlags ${Section} $1 ; set flag for section
- ${EndIf}
-!macroend
-
-; portable mode
-${toggleSection} "PORTABLE" ${SEC_PORTABLE}
-
-; desktop shortcuts
-${toggleSection} "NODESKTOPLINK" ${SEC_DESKTOP}
-
-; startmenu
-${toggleSection} "NOSTARTMENU" ${SEC_START}
-
-; disable registry writes
-${getParameterValue} "NOREGISTRY" "false"
-Pop $0
-
-${If} $0 == ""
- IntOp $REGISTRY 0 + 0
-${Else}
- IntOp $REGISTRY 0 + 1 ; default, write registry
-${EndIf}
-
-System::Store "l" ; restore register
-
diff --git a/installer/sections/shortcuts_desktop.nsh b/installer/sections/shortcuts_desktop.nsh
deleted file mode 100644
index 6b282c2..0000000
--- a/installer/sections/shortcuts_desktop.nsh
+++ /dev/null
@@ -1,9 +0,0 @@
-
-!ifdef INSTALL
-
- SetOutPath "$INSTDIR"
-
-
-!else
-
-!endif
diff --git a/installer/sections/shortcuts_startMenu.nsh b/installer/sections/shortcuts_startMenu.nsh
deleted file mode 100644
index 2e17211..0000000
--- a/installer/sections/shortcuts_startMenu.nsh
+++ /dev/null
@@ -1,26 +0,0 @@
-!ifdef INSTALL
-
- SetOutPath "$INSTDIR"
- ; Main shortcuts
- CreateDirectory "$SMPROGRAMS\${PRODUCT_NAME}"
- SetOutPath "$INSTDIR"
-
- CreateShortCut "$SMPROGRAMS\${PRODUCT_NAME}\Test Spring.lnk" "$INSTDIR\spring.exe"
- CreateShortCut "$SMPROGRAMS\${PRODUCT_NAME}\Test Spring (safemode).lnk" "$INSTDIR\spring.exe" "--safemode"
- CreateShortCut "$SMPROGRAMS\${PRODUCT_NAME}\Uninstall Spring.lnk" "$INSTDIR\uninst.exe"
-
- WriteINIStr "$SMPROGRAMS\${PRODUCT_NAME}\Read Me First.URL" "InternetShortcut" "URL" "https://springrts.com/wiki/Read_Me_First"
-
-!else
-
- ; Shortcuts
- Delete "$SMPROGRAMS\${PRODUCT_NAME}\Test Spring.lnk"
- Delete "$SMPROGRAMS\${PRODUCT_NAME}\Test Spring (safemode).lnk"
- Delete "$SMPROGRAMS\${PRODUCT_NAME}\Uninstall Spring.lnk"
-
- Delete "$SMPROGRAMS\${PRODUCT_NAME}\Read Me First.URL"
-
- ; delete the folders
- RMDir "$SMPROGRAMS\${PRODUCT_NAME}"
-
-!endif
diff --git a/installer/sections/vcredist.nsh b/installer/sections/vcredist.nsh
deleted file mode 100644
index 550261b..0000000
--- a/installer/sections/vcredist.nsh
+++ /dev/null
@@ -1,9 +0,0 @@
-!ifdef INSTALL
- File /oname=vcredist_x86.exe ${VCREDIST}
- ${IfNot} ${SectionIsSelected} ${SEC_PORTABLE}
- ; install vcredist only on non-portal installs
- ExecWait '"$INSTDIR\vcredist_x86.exe" /q'
- ${EndIF}
-!else
- Delete "$INSTDIR\vcredist_x86.exe"
-!endif
diff --git a/installer/spring.nsi b/installer/spring.nsi
deleted file mode 100644
index 77b5609..0000000
--- a/installer/spring.nsi
+++ /dev/null
@@ -1,213 +0,0 @@
-; Script generated by the HM NIS Edit Script Wizard.
-
-!addPluginDir "nsis_plugins"
-
-; Use the 7zip-like compressor
-SetCompressor /FINAL /SOLID lzma
-
-
-!include "springsettings.nsh"
-!include "LogicLib.nsh"
-!include "Sections.nsh"
-!include "WordFunc.nsh"
-!insertmacro VersionCompare
-
-; this registry entry is deprecated (march 2011, use HKLM\Software\Spring\SpringEngine[Helper] instead)
-!define PRODUCT_DIR_REGKEY "Software\Microsoft\Windows\CurrentVersion\App Paths\spring.exe"
-!define PRODUCT_UNINST_KEY "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}"
-!define PRODUCT_UNINST_ROOT_KEY "HKLM"
-!define PRODUCT_ROOT_KEY "HKLM"
-!define PRODUCT_KEY "Software\Spring"
-
-; MUI 1.67 compatible ------
-!include "MUI.nsh"
-
-; MUI Settings
-!define MUI_ABORTWARNING
-!define MUI_ICON "graphics\InstallerIcon.ico"
-!define MUI_UNICON "${NSISDIR}\Contrib\Graphics\Icons\modern-uninstall.ico"
-!define MUI_WELCOMEFINISHPAGE_BITMAP "graphics\SideBanner.bmp"
-;!define MUI_COMPONENTSPAGE_SMALLDESC ;puts description on the bottom, but much shorter.
-!define MUI_COMPONENTSPAGE_TEXT_TOP "Some of these components must be downloaded during the install process."
-
-
-; Welcome page
-!insertmacro MUI_PAGE_WELCOME
-; Licensepage
-!insertmacro MUI_PAGE_LICENSE "..\gpl-2.0.txt"
-
-; Components page
-!insertmacro MUI_PAGE_COMPONENTS
-
-; Directory page
-!insertmacro MUI_PAGE_DIRECTORY
-; Instfiles page
-!insertmacro MUI_PAGE_INSTFILES
-
-; Finish page
-
-!define MUI_FINISHPAGE_SHOWREADME "https://springrts.com/wiki/Read_Me_First"
-!define MUI_FINISHPAGE_SHOWREADME_TEXT "Open $\"Read Me First$\" Webpage"
-;!define MUI_FINISHPAGE_RUN "$INSTDIR\spring.exe"
-;!define MUI_FINISHPAGE_RUN_TEXT "Configure ${PRODUCT_NAME} settings now"
-!define MUI_FINISHPAGE_TEXT "${PRODUCT_NAME} version ${PRODUCT_VERSION} has been successfully installed or updated from a previous version. You should configure Spring settings now if this is a fresh installation. If you did not install spring to C:\Program Files\Spring you will need to point the settings program to the install location."
-
-!define MUI_FINISHPAGE_LINK "The Spring RTS Project website"
-!define MUI_FINISHPAGE_LINK_LOCATION ${PRODUCT_WEB_SITE}
-!define MUI_FINISHPAGE_NOREBOOTSUPPORT
-
-!insertmacro MUI_PAGE_FINISH
-
-; Uninstaller pages
-!insertmacro MUI_UNPAGE_INSTFILES
-
-; Language files
-!insertmacro MUI_LANGUAGE "English"
-
-; MUI end ------
-
-Name "${PRODUCT_NAME} ${PRODUCT_VERSION}"
-
-!define SP_OUTSUFFIX1 ""
-
-; set output filename for installer
-OutFile "${SP_BASENAME}${SP_OUTSUFFIX1}.exe"
-InstallDir "$PROGRAMFILES\Spring"
-InstallDirRegKey ${PRODUCT_ROOT_KEY} "${PRODUCT_DIR_REGKEY}" "Path"
-
-VAR REGISTRY ; if 1 registry values are written
-
-!include "include\echo.nsh"
-!include "include\fileassoc.nsh"
-!include "include\fileExistChecks.nsh"
-!include "include\fileMisc.nsh"
-!include "include\extractFile.nsh"
-!include "include\getParameterValue.nsh"
-
-
-${!echonow} ""
-${!echonow} "Base dir: <engine-source-root>/installer/"
-
-!ifndef MIN_PORTABLE_ARCHIVE
- !error "MIN_PORTABLE_ARCHIVE undefined: please specifiy where minimal-portable 7z-archive which contains the spring-engine is"
-!else
- ${!echonow} "Using MIN_PORTABLE_ARCHIVE: ${MIN_PORTABLE_ARCHIVE}"
-!endif
-
-!ifndef NSI_UNINSTALL_FILES
- !warning "NSI_UNINSTALL_FILES not defined"
-!else
- ${!echonow} "Using NSI_UNINSTALL_FILES: ${NSI_UNINSTALL_FILES}"
-!endif
-
-!ifndef VCREDIST
- !error "VCREDIST not defined"
-!else
- ${!echonow} "Using VCREDIST: ${VCREDIST}"
-!endif
-
-
-Section "Engine" SEC_MAIN
- ; make this section read-only -> user can not deselect it
- SectionIn RO
-
- !define INSTALL
- ${!echonow} "Processing: main"
- !include "sections\main.nsh"
- ${!echonow} "Processing: deprecated"
- !include "sections\deprecated.nsh"
- !undef INSTALL
-SectionEnd
-
-Section "Desktop shortcuts" SEC_DESKTOP
- !define INSTALL
- ${!echonow} "Processing: shortcuts - Desktop"
- !include "sections\shortcuts_desktop.nsh"
- !undef INSTALL
-SectionEnd
-
-Section "Start menu shortcuts" SEC_START
- !define INSTALL
- ${!echonow} "Processing: shortcuts - Start menu"
- !include "sections\shortcuts_startMenu.nsh"
- !undef INSTALL
-SectionEnd
-
-
-Section /o "Portable" SEC_PORTABLE
- !define INSTALL
- ${!echonow} "Processing: Portable"
- !include "sections\portable.nsh"
- !undef INSTALL
-SectionEnd
-
-Section "" SEC_VCREDIST
- !define INSTALL
- ${!echonow} "Processing: vcredist"
- !include "sections\vcredist.nsh"
- !undef INSTALL
-SectionEnd
-
-!include "sections\sectiondesc.nsh"
-
-Section -Post
- ${!echonow} "Processing: Registry entries"
- ${IfNot} ${SectionIsSelected} ${SEC_PORTABLE}
- ; make non-portable
- Delete "$INSTDIR\springsettings.cfg"
- ; Create uninstaller
- WriteUninstaller "$INSTDIR\uninst.exe"
- ${If} $REGISTRY = 1
- WriteRegStr ${PRODUCT_ROOT_KEY} "${PRODUCT_DIR_REGKEY}" "@" "$INSTDIR\spring.exe"
- WriteRegStr ${PRODUCT_ROOT_KEY} "${PRODUCT_DIR_REGKEY}" "Path" "$INSTDIR"
- WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayName" "$(^Name)"
- WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "UninstallString" "$INSTDIR\uninst.exe"
- WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayIcon" "$INSTDIR\spring.exe"
- WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayVersion" "${PRODUCT_VERSION}"
- WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "URLInfoAbout" "${PRODUCT_WEB_SITE}"
- WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "Publisher" "${PRODUCT_PUBLISHER}"
- ${EndIf}
- ${EndIf}
-SectionEnd
-
-Function .onInit
- ${!echonow} ""
- ; enable/disable sections depending on parameters
- !include "sections/setupSections.nsh"
-FunctionEnd
-
-Function un.onUninstSuccess
- IfSilent +3
- HideWindow
- MessageBox MB_ICONINFORMATION|MB_OK "$(^Name) was successfully removed from your computer."
-FunctionEnd
-
-Function un.onInit
- IfSilent +3
- MessageBox MB_ICONQUESTION|MB_YESNO|MB_DEFBUTTON2 "Are you sure you want to completely remove $(^Name) and all of its components?" IDYES +2
- Abort
-FunctionEnd
-
-
-Section Uninstall
- ${!echonow} "Processing: Uninstall"
-
- !include "sections\main.nsh"
- !include "sections\deprecated.nsh"
-
- # FIXME workaround part2
- Delete "$INSTDIR\pthreadGC2.dll"
-
- !include "sections\shortcuts_startMenu.nsh"
- !include "sections\shortcuts_desktop.nsh"
- !include "sections\portable.nsh"
- !ifdef NSI_UNINSTALL_FILES
- !include "${NSI_UNINSTALL_FILES}"
- !endif
- ; All done
- RMDir "$INSTDIR"
-
- DeleteRegKey ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}"
- DeleteRegKey ${PRODUCT_ROOT_KEY} "${PRODUCT_DIR_REGKEY}"
- SetAutoClose true
-SectionEnd
diff --git a/installer/springsettings.nsh b/installer/springsettings.nsh
deleted file mode 100644
index 45248f1..0000000
--- a/installer/springsettings.nsh
+++ /dev/null
@@ -1,21 +0,0 @@
-!ifdef TEST_BUILD
- !define PRODUCT_NAME "Spring - Test Build"
-!else
- !define PRODUCT_NAME "Spring"
-!endif
-
-!define PRODUCT_VERSION "${VERSION_TAG}"
-!define SP_BASENAME "spring_${PRODUCT_VERSION}"
-!define PRODUCT_PUBLISHER "Spring team"
-!define PRODUCT_WEB_SITE "http://www.springrts.com"
-
-; This is required, and has to be a string constant
-; (can not contain defines like ${BLA})
-VIProductVersion "0.0.0.1"
-
-VIAddVersionKey "ProductName" "Spring RTS engine"
-VIAddVersionKey "CompanyName" "Spring community"
-VIAddVersionKey "LegalCopyright" "GNU GPL V2 and V3"
-VIAddVersionKey "FileDescription" "Engine launcher executable"
-VIAddVersionKey "FileVersion" "${VERSION_TAG}"
-
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/spring.git
More information about the Pkg-games-commits
mailing list