diff --git a/installer/AMXXRelease/AMXXRelease.exe b/installer/AMXXRelease/AMXXRelease.exe index 20c369a7..2aa7fda4 100755 Binary files a/installer/AMXXRelease/AMXXRelease.exe and b/installer/AMXXRelease/AMXXRelease.exe differ diff --git a/installer/amxmodx-installer.nsi b/installer/amxmodx-installer.nsi index f5aefdf5..1362671c 100755 --- a/installer/amxmodx-installer.nsi +++ b/installer/amxmodx-installer.nsi @@ -2,7 +2,7 @@ ; Licensed under the GNU General Public License ; Written by -=HaXoMaTiC=- !define PRODUCT_NAME "AMX Mod X Installer" -!define PRODUCT_VERSION "1.55" +!define PRODUCT_VERSION "1.60" !define PRODUCT_PUBLISHER "AMX Mod X Dev Team" !define PRODUCT_WEB_SITE "http://www.amxmodx.org/" !define PRODUCT_DIR_REGKEY "Software\Microsoft\Windows\CurrentVersion\App Paths\Installer.exe" @@ -64,7 +64,6 @@ Section "MainSection" SEC01 SetOverwrite try File "installer\Installer.exe" SetOutPath "$INSTDIR\amxxstudio" - File "installer\files\amxxstudio\AMXX_Studio.cfg" File "installer\files\amxxstudio\AMXX_Studio.exe" File "installer\files\amxxstudio\SciLexer.dll" SetOutPath "$INSTDIR\amxxstudio\config" @@ -73,16 +72,34 @@ Section "MainSection" SEC01 File "installer\files\amxxstudio\config\Editor.sci" File "installer\files\amxxstudio\config\Notes.dat" File "installer\files\amxxstudio\config\Other.csl" - File "installer\files\amxxstudio\config\PAWN.csl" + File "installer\files\amxxstudio\config\Pawn.csl" File "installer\files\amxxstudio\config\Plugins.cfg" File "installer\files\amxxstudio\config\Settings.ini" SetOutPath "$INSTDIR\amxxstudio\plugins" - File "installer\files\amxxstudio\plugins\Functions and Events.txt" - File "installer\files\amxxstudio\plugins\HelloWorld.cfg" - File "installer\files\amxxstudio\plugins\HelloWorld.dll" - File "installer\files\amxxstudio\plugins\HelloWorld.dof" - File "installer\files\amxxstudio\plugins\HelloWorld.dpr" - File "installer\files\amxxstudio\plugins\HelloWorld.res" + File "installer\files\amxxstudio\plugins\Functions and Events.htm" + File "installer\files\amxxstudio\plugins\Hello World - CPP.dll" + File "installer\files\amxxstudio\plugins\Hello World - Delphi.dll" + SetOutPath "$INSTDIR\amxxstudio\plugins\Functions and Events-Files" + File "installer\files\amxxstudio\plugins\Functions and Events-files\filelist.xml" + File "installer\files\amxxstudio\plugins\Functions and Events-files\sheet001.htm" + File "installer\files\amxxstudio\plugins\Functions and Events-files\sheet002.htm" + File "installer\files\amxxstudio\plugins\Functions and Events-files\stylesheet.css" + File "installer\files\amxxstudio\plugins\Functions and Events-files\tabstrip.htm" + SetOutPath "$INSTDIR\amxxstudio\plugins\Hello_World CPP" + File "installer\files\amxxstudio\plugins\Hello_World CPP\Hello_World.dsp" + File "installer\files\amxxstudio\plugins\Hello_World CPP\Hello_World.dsw" + File "installer\files\amxxstudio\plugins\Hello_World CPP\Hello_World.ncb" + File "installer\files\amxxstudio\plugins\Hello_World CPP\Hello_World.opt" + File "installer\files\amxxstudio\plugins\Hello_World CPP\Hello_World.plg" + File "installer\files\amxxstudio\plugins\Hello_World CPP\sample.cpp" + File "installer\files\amxxstudio\plugins\Hello_World CPP\sample.h" + File "installer\files\amxxstudio\plugins\Hello_World CPP\studio_api.h" + SetOutPath "$INSTDIR\amxxstudio\plugins\Hello_World Delphi" + File "installer\files\amxxstudio\plugins\Hello_World Delphi\HelloWorld.cfg" + File "installer\files\amxxstudio\plugins\Hello_World Delphi\HelloWorld.dof" + File "installer\files\amxxstudio\plugins\Hello_World Delphi\HelloWorld.dpr" + File "installer\files\amxxstudio\plugins\Hello_World Delphi\HelloWorld.res" + File "installer\files\amxxstudio\plugins\Hello_World Delphi\studioapi.pas" SetOutPath "$INSTDIR\files\base\configs" File "installer\files\base\configs\amxx.cfg" File "installer\files\base\configs\clcmds.ini" @@ -229,7 +246,6 @@ Section "MainSection" SEC01 File "installer\files\base\scripting\include\float.inc" File "installer\files\base\scripting\include\fun.inc" File "installer\files\base\scripting\include\geoip.inc" - File "installer\files\base\scripting\include\jghg2.inc" File "installer\files\base\scripting\include\lang.inc" File "installer\files\base\scripting\include\ns.inc" File "installer\files\base\scripting\include\ns2amx.inc" @@ -584,7 +600,6 @@ Section Uninstall Delete "$INSTDIR\files\base\scripting\include\ns.inc" Delete "$INSTDIR\files\base\scripting\include\nvault.inc" Delete "$INSTDIR\files\base\scripting\include\lang.inc" - Delete "$INSTDIR\files\base\scripting\include\jghg2.inc" Delete "$INSTDIR\files\base\scripting\include\geoip.inc" Delete "$INSTDIR\files\base\scripting\include\fun.inc" Delete "$INSTDIR\files\base\scripting\include\float.inc" @@ -722,7 +737,6 @@ Section Uninstall Delete "$INSTDIR\files\base\configs\cmds.ini" Delete "$INSTDIR\files\base\configs\clcmds.ini" Delete "$INSTDIR\files\base\configs\amxx.cfg" - Delete "$INSTDIR\files\amxxstudio\AMXX_Studio.cfg" Delete "$INSTDIR\files\amxxstudio\AMXX_Studio.exe" Delete "$INSTDIR\files\amxxstudio\SciLexer.dll" Delete "$INSTDIR\files\amxxstudio\config\C++.csl" @@ -733,12 +747,27 @@ Section Uninstall Delete "$INSTDIR\files\amxxstudio\config\PAWN.csl" Delete "$INSTDIR\files\amxxstudio\config\Plugins.cfg" Delete "$INSTDIR\files\amxxstudio\config\Settings.ini" - Delete "$INSTDIR\files\amxxstudio\plugins\Functions and Events.txt" - Delete "$INSTDIR\files\amxxstudio\plugins\HelloWorld.cfg" - Delete "$INSTDIR\files\amxxstudio\plugins\HelloWorld.dll" - Delete "$INSTDIR\files\amxxstudio\plugins\HelloWorld.dof" - Delete "$INSTDIR\files\amxxstudio\plugins\HelloWorld.dpr" - Delete "$INSTDIR\files\amxxstudio\plugins\HelloWorld.res" + Delete "$INSTDIR\files\amxxstudio\plugins\Functions and Events.htm" + Delete "$INSTDIR\files\amxxstudio\plugins\Hello World - CPP.dll" + Delete "$INSTDIR\files\amxxstudio\plugins\Hello World - Delphi.dll" + Delete "$INSTDIR\files\amxxstudio\plugins\Functions and Events-files\filelist.xml" + Delete "$INSTDIR\files\amxxstudio\plugins\Functions and Events-files\sheet001.htm" + Delete "$INSTDIR\files\amxxstudio\plugins\Functions and Events-files\sheet002.htm" + Delete "$INSTDIR\files\amxxstudio\plugins\Functions and Events-files\stylesheet.css" + Delete "$INSTDIR\files\amxxstudio\plugins\Functions and Events-files\tabstrip.htm" + Delete "$INSTDIR\files\amxxstudio\plugins\Hello_World CPP\Hello_World.dsp" + Delete "$INSTDIR\files\amxxstudio\plugins\Hello_World CPP\Hello_World.dsw" + Delete "$INSTDIR\files\amxxstudio\plugins\Hello_World CPP\Hello_World.ncb" + Delete "$INSTDIR\files\amxxstudio\plugins\Hello_World CPP\Hello_World.opt" + Delete "$INSTDIR\files\amxxstudio\plugins\Hello_World CPP\Hello_World.plg" + Delete "$INSTDIR\files\amxxstudio\plugins\Hello_World CPP\sample.cpp" + Delete "$INSTDIR\files\amxxstudio\plugins\Hello_World CPP\sample.h" + Delete "$INSTDIR\files\amxxstudio\plugins\Hello_World CPP\studio_api.h" + Delete "$INSTDIR\files\amxxstudio\plugins\Hello_World Delphi\HelloWorld.cfg" + Delete "$INSTDIR\files\amxxstudio\plugins\Hello_World Delphi\HelloWorld.dof" + Delete "$INSTDIR\files\amxxstudio\plugins\Hello_World Delphi\HelloWorld.dpr" + Delete "$INSTDIR\files\amxxstudio\plugins\Hello_World Delphi\HelloWorld.res" + Delete "$INSTDIR\files\amxxstudio\plugins\Hello_World Delphi\studioapi.pas" Delete "$SMPROGRAMS\$ICONS_GROUP\Uninstall.lnk" Delete "$SMPROGRAMS\$ICONS_GROUP\Website.lnk" @@ -788,6 +817,7 @@ Section Uninstall RMDir "$INSTDIR\AMXX Studio\plugins" RMDir "$INSTDIR\AMXX Studio" RMDir /r "$INSTDIR" + RMDir "$INSTDIR" RMDir "" DeleteRegKey ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}"