Author: jhinrichs
Date: Wed Apr 9 00:09:53 2008
New Revision: 25693
URL: http://svn.gna.org/viewcvs/wesnoth?rev=25693&view=rev
Log:
Update windows installer stuff for release 1.4.1
Modified:
trunk/packaging/windows/PackageWesnoth.vbs
trunk/packaging/windows/Wesnoth.iss
Modified: trunk/packaging/windows/PackageWesnoth.vbs
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/packaging/windows/PackageWesnoth.vbs?rev=25693&r1=25692&r2=25693&view=diff
==============================================================================
--- trunk/packaging/windows/PackageWesnoth.vbs (original)
+++ trunk/packaging/windows/PackageWesnoth.vbs Wed Apr 9 00:09:53 2008
@@ -8,10 +8,10 @@
'on error resume next
'Initialization
-SourceDirectory = "C:\Entwicklung\Wesnoth\wesnoth-1.3.19\"
+SourceDirectory = "C:\Entwicklung\Wesnoth\wesnoth-1.4.1\"
DLLDirectory = "C:\Entwicklung\Wesnoth\DLL\mingw\"
PythonDirectory = "C:\Entwicklung\Wesnoth\DLL\python\"
-DestinationDirectory = "C:\Entwicklung\Wesnoth\Release 1.3.19\"
+DestinationDirectory = "C:\Entwicklung\Wesnoth\Release 1.4.1\"
GetTextDirectory = "D:\Programme\GnuWin32\bin\"
Set fso = CreateObject("Scripting.FileSystemObject")
Set shell = CreateObject("WScript.Shell")
@@ -20,42 +20,18 @@
If fso.FolderExists(DestinationDirectory) = False Then
fso.CreateFolder(DestinationDirectory)
End If
+Call fso.DeleteFile(DestinationDirectory + "*.*")
-Call fso.DeleteFile(DestinationDirectory + "*.*")
Call fso.CopyFile(SourceDirectory + "Copying", DestinationDirectory)
Call fso.CopyFile(SourceDirectory + "Copyright", DestinationDirectory)
-Call fso.CopyFile(SourceDirectory + "editor.exe", DestinationDirectory)
-Call fso.CopyFile(DLLDirectory + "editor.ico", DestinationDirectory)
-Call fso.CopyFile(DLLDirectory + "freetype6.dll", DestinationDirectory)
-Call fso.CopyFile(DLLDirectory + "fribidi.dll", DestinationDirectory)
-Call fso.CopyFile(DLLDirectory + "gettextlib.dll", DestinationDirectory)
-Call fso.CopyFile(DLLDirectory + "gettextpo.dll", DestinationDirectory)
-Call fso.CopyFile(DLLDirectory + "gettextsrc.dll", DestinationDirectory)
-Call fso.CopyFile(DLLDirectory + "jpeg.dll", DestinationDirectory)
-Call fso.CopyFile(DLLDirectory + "iconv.dll", DestinationDirectory)
-Call fso.CopyFile(DLLDirectory + "libintl3.dll", DestinationDirectory)
-Call fso.CopyFile(DLLDirectory + "libogg-0.dll", DestinationDirectory)
-Call fso.CopyFile(DLLDirectory + "libpng12-0.dll", DestinationDirectory)
-Call fso.CopyFile(DLLDirectory + "libvorbis-0.dll", DestinationDirectory)
-Call fso.CopyFile(DLLDirectory + "libvorbisfile-3.dll", DestinationDirectory)
-Call fso.CopyFile(DLLDirectory + "mingwm10.dll", DestinationDirectory)
-Call fso.CopyFile(DLLDirectory + "msvcp60.dll", DestinationDirectory)
-Call fso.CopyFile(DLLDirectory + "python24.dll", DestinationDirectory)
Call fso.CopyFile(SourceDirectory + "Readme", DestinationDirectory)
-Call fso.CopyFile(DLLDirectory + "SDL.dll", DestinationDirectory)
-Call fso.CopyFile(DLLDirectory + "SDL_image.dll", DestinationDirectory)
-Call fso.CopyFile(DLLDirectory + "SDL_mixer.dll", DestinationDirectory)
-Call fso.CopyFile(DLLDirectory + "SDL_net.dll", DestinationDirectory)
-Call fso.CopyFile(DLLDirectory + "SDL_ttf.dll", DestinationDirectory)
-Call fso.CopyFile(SourceDirectory + "wesnoth.exe", DestinationDirectory)
-Call fso.CopyFile(DLLDirectory + "wesnoth.ico", DestinationDirectory)
-Call fso.CopyFile(SourceDirectory + "wesnothd.exe", DestinationDirectory)
-Call fso.CopyFile(DLLDirectory + "zlib1.dll", DestinationDirectory)
-Call fso.CopyFolder(PythonDirectory + "lib", DestinationDirectory)
+Call fso.CopyFolder(DLLDirectory + "bin", DestinationDirectory)
+Call fso.CopyFolder(SourceDirectory + "bin", DestinationDirectory)
Call fso.CopyFolder(SourceDirectory + "data", DestinationDirectory)
Call fso.CopyFolder(SourceDirectory + "fonts", DestinationDirectory)
Call fso.CopyFolder(SourceDirectory + "images", DestinationDirectory)
+Call fso.CopyFolder(PythonDirectory + "lib", DestinationDirectory)
Call fso.CopyFolder(SourceDirectory + "sounds", DestinationDirectory)
If fso.FolderExists(DestinationDirectory + "manual_html") = False Then
@@ -71,7 +47,7 @@
End If
domains = Array("wesnoth", "wesnoth-aoi", "wesnoth-did", "wesnoth-editor",
"wesnoth-ei", "wesnoth-httt", "wesnoth-l", "wesnoth-lib",
"wesnoth-multiplayer", "wesnoth-nr", "wesnoth-sof", "wesnoth-sotbe",
"wesnoth-tb", "wesnoth-thot", "wesnoth-trow", "wesnoth-tsg",
"wesnoth-tutorial", "wesnoth-units", "wesnoth-utbs")
-languages = Array("af", "bg", "ca", "[EMAIL PROTECTED]", "cs", "da", "de",
"el", "en_GB", "eo", "es", "et", "eu", "fi", "fr", "gl_ES", "he", "hu", "id",
"it", "ja", "ko", "la", "nb_NO", "nl", "pl", "pt", "pt_BR", "ro", "ru", "sk",
"sl", "sr", "[EMAIL PROTECTED]", "sv", "tl", "tr", "zh_CN")
+languages = Array("af", "bg", "ca", "[EMAIL PROTECTED]", "cs", "da", "de",
"el", "en_GB", "eo", "es", "et", "eu", "fi", "fr", "gl_ES", "he", "hr", "hu",
"id", "it", "ja", "ko", "la", "nb_NO", "nl", "pl", "pt", "pt_BR", "ro", "ru",
"sk", "sl", "sr", "[EMAIL PROTECTED]", "sv", "tl", "tr", "zh_CN", "zh_TW")
For Each domain In domains
For Each language In languages
Modified: trunk/packaging/windows/Wesnoth.iss
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/packaging/windows/Wesnoth.iss?rev=25693&r1=25692&r2=25693&view=diff
==============================================================================
--- trunk/packaging/windows/Wesnoth.iss (original)
+++ trunk/packaging/windows/Wesnoth.iss Wed Apr 9 00:09:53 2008
@@ -3,21 +3,22 @@
[Setup]
AppName=Battle for Wesnoth
-AppVerName=Battle for Wesnoth 1.3.19
+AppVerName=Battle for Wesnoth 1.4.1
AppPublisher=David White
AppPublisherURL=http://www.wesnoth.org
AppSupportURL=http://www.wesnoth.org
AppUpdatesURL=http://www.wesnoth.org
-DefaultDirName={pf}\Wesnoth 1.3.19
-DefaultGroupName=Wesnoth 1.3.19
-LicenseFile=C:\Entwicklung\Wesnoth\Release 1.3.19\COPYING
-OutputBaseFilename=wesnoth-1.3.19-windows
+DefaultDirName={pf}\Wesnoth 1.4.1
+DefaultGroupName=Wesnoth 1.4.1
+LicenseFile=C:\Entwicklung\Wesnoth\Release 1.4.1\COPYING
+OutputBaseFilename=wesnoth-1.4.1-windows
Compression=lzma
SolidCompression=yes
+SourceDir=C:\Entwicklung\Wesnoth\Release 1.4.1
UsePreviousAppDir=no
UsePreviousGroup=no
-WizardImageFile=WindowsInstallerGraphic.bmp
-WizardSmallImageFile=windows_installer_w_881.bmp
+WizardImageFile=C:\Entwicklung\Wesnoth\Wesnoth_SVN_Work\packaging\windows\WindowsInstallerGraphic.bmp
+WizardSmallImageFile=C:\Entwicklung\Wesnoth\Wesnoth_SVN_Work\packaging\windows\windows_installer_w_881.bmp
[Languages]
Name: "english"; MessagesFile: "compiler:Default.isl"
@@ -26,17 +27,58 @@
Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription:
"{cm:AdditionalIcons}"; Flags: unchecked
[Files]
-Source: "C:\Entwicklung\Wesnoth\Release 1.3.19\*"; DestDir: "{app}"; Flags:
ignoreversion recursesubdirs createallsubdirs
+Source: "*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs
createallsubdirs; Components: "Main"
[Icons]
-Name: "{group}\Battle for Wesnoth (Fullscreen)"; Filename:
"{app}\wesnoth.exe"; Parameters: "--fullscreen"; WorkingDir: "{app}";
IconFilename: "{app}\wesnoth.ico"
-Name: "{group}\Battle for Wesnoth (Windowed)"; Filename: "{app}\wesnoth.exe";
Parameters: "--windowed"; WorkingDir: "{app}"; IconFilename: "{app}\wesnoth.ico"
-Name: "{group}\Map Editor"; Filename: "{app}\editor.exe"; WorkingDir: "{app}";
IconFilename: "{app}\editor.ico"
-Name: "{group}\Multiplayer Server"; Filename: "{app}\wesnothd.exe";
WorkingDir: "{app}"
-Name: "{group}\Manual"; Filename: "{app}\manual_html\manual.en.html";
WorkingDir: "{app}"
+Name: "{group}\Battle for Wesnoth (Fullscreen)"; Filename:
"{app}\bin\wesnoth_i486.exe"; Parameters: "--fullscreen"; WorkingDir: "{app}";
IconFilename: "{app}\wesnoth.ico"; Components: "Processor\486"
+Name: "{group}\Battle for Wesnoth (Fullscreen)"; Filename:
"{app}\bin\wesnoth_p2.exe"; Parameters: "--fullscreen"; WorkingDir: "{app}";
IconFilename: "{app}\wesnoth.ico"; Components: "Processor\P2"
+Name: "{group}\Battle for Wesnoth (Fullscreen)"; Filename:
"{app}\bin\wesnoth_p4.exe"; Parameters: "--fullscreen"; WorkingDir: "{app}";
IconFilename: "{app}\wesnoth.ico"; Components: "Processor\P4"
+Name: "{group}\Battle for Wesnoth (Fullscreen)"; Filename:
"{app}\bin\wesnoth_k6.exe"; Parameters: "--fullscreen"; WorkingDir: "{app}";
IconFilename: "{app}\wesnoth.ico"; Components: "Processor\K6"
+Name: "{group}\Battle for Wesnoth (Windowed)"; Filename: "{app}\wesnoth.exe";
Parameters: "--windowed"; WorkingDir: "{app}"; IconFilename:
"{app}\wesnoth.ico"; Components: "Main";
+Name: "{group}\Battle for Wesnoth (Windowed)"; Filename:
"{app}\bin\wesnoth_i486.exe"; Parameters: "--windowed"; WorkingDir: "{app}";
IconFilename: "{app}\wesnoth.ico"; Components: "Processor\486"
+Name: "{group}\Battle for Wesnoth (Windowed)"; Filename:
"{app}\bin\wesnoth_p2.exe"; Parameters: "--windowed"; WorkingDir: "{app}";
IconFilename: "{app}\wesnoth.ico"; Components: "Processor\P2"
+Name: "{group}\Battle for Wesnoth (Windowed)"; Filename:
"{app}\bin\wesnoth_p4.exe"; Parameters: "--windowed"; WorkingDir: "{app}";
IconFilename: "{app}\wesnoth.ico"; Components: "Processor\P4"
+Name: "{group}\Battle for Wesnoth (Windowed)"; Filename:
"{app}\bin\wesnoth_k6.exe"; Parameters: "--windowed"; WorkingDir: "{app}";
IconFilename: "{app}\wesnoth.ico"; Components: "Processor\K6"
+Name: "{group}\Battle for Wesnoth (Windowed)"; Filename:
"{app}\bin\wesnoth_athlon.exe"; Parameters: "--windowed"; WorkingDir: "{app}";
IconFilename: "{app}\wesnoth.ico"; Components: "Processor\Athlon"
+Name: "{group}\Battle for Wesnoth (All Processors)"; Filename:
"{app}\bin\wesnoth.exe"; Parameters: "--fullscreen"; WorkingDir: "{app}";
IconFilename: "{app}\wesnoth.ico"; Components: "Main"
+Name: "{group}\Map Editor"; Filename: "{app}\bin\editor_i486.exe"; WorkingDir:
"{app}"; IconFilename: "{app}\editor.ico"; Components: "Processor\486"
+Name: "{group}\Map Editor"; Filename: "{app}\bin\editor_p2.exe"; WorkingDir:
"{app}"; IconFilename: "{app}\editor.ico"; Components: "Processor\P2"
+Name: "{group}\Map Editor"; Filename: "{app}\bin\editor_p4.exe"; WorkingDir:
"{app}"; IconFilename: "{app}\editor.ico"; Components: "Processor\P4"
+Name: "{group}\Map Editor"; Filename: "{app}\bin\editor_k6.exe"; WorkingDir:
"{app}"; IconFilename: "{app}\editor.ico"; Components: "Processor\K6"
+Name: "{group}\Map Editor"; Filename: "{app}\bin\editor_athlon.exe";
WorkingDir: "{app}"; IconFilename: "{app}\editor.ico"; Components:
"Processor\Athlon"
+Name: "{group}\Map Editor (All Processors)"; Filename: "{app}\bin\editor.exe";
WorkingDir: "{app}"; IconFilename: "{app}\editor.ico"; Components: "Main"
+Name: "{group}\Multiplayer Server"; Filename: "{app}\bin\wesnothd_i486.exe";
WorkingDir: "{app}"; Components: "Processor\486"
+Name: "{group}\Multiplayer Server"; Filename: "{app}\bin\wesnothd_p2.exe";
WorkingDir: "{app}"; Components: "Processor\P2"
+Name: "{group}\Multiplayer Server"; Filename: "{app}\bin\wesnothd_p4.exe";
WorkingDir: "{app}"; Components: "Processor\P4"
+Name: "{group}\Multiplayer Server"; Filename: "{app}\bin\wesnothd_k6.exe";
WorkingDir: "{app}"; Components: "Processor\K6"
+Name: "{group}\Multiplayer Server"; Filename: "{app}\bin\wesnothd_athlon.exe";
WorkingDir: "{app}"; Components: "Processor\Athlon"
+Name: "{group}\Multiplayer Server"; Filename: "{app}\bin\wesnothd.exe";
WorkingDir: "{app}"; Components: "Main"
+Name: "{group}\Manual"; Filename: "{app}\manual_html\manual.en.html";
WorkingDir: "{app}"; Components: "Main"
Name: "{group}\Uninstall Battle for Wesnoth"; Filename: "{uninstallexe}"
-Name: "{userdesktop}\Battle for Wesnoth"; Filename: "{app}\wesnoth.exe";
Tasks: desktopicon; WorkingDir: "{app}"; IconFilename: "{app}\wesnoth.ico"
+Name: "{userdesktop}\Battle for Wesnoth"; Filename:
"{app}\bin\wesnoth_i486.exe"; Tasks: desktopicon; WorkingDir: "{app}";
IconFilename: "{app}\wesnoth.ico"; Components: "Processor\486"
+Name: "{userdesktop}\Battle for Wesnoth"; Filename:
"{app}\bin\wesnoth_p2.exe"; Tasks: desktopicon; WorkingDir: "{app}";
IconFilename: "{app}\wesnoth.ico"; Components: "Processor\P2"
+Name: "{userdesktop}\Battle for Wesnoth"; Filename:
"{app}\bin\wesnoth_p4.exe"; Tasks: desktopicon; WorkingDir: "{app}";
IconFilename: "{app}\wesnoth.ico"; Components: "Processor\P4"
+Name: "{userdesktop}\Battle for Wesnoth"; Filename:
"{app}\bin\wesnoth_k6.exe"; Tasks: desktopicon; WorkingDir: "{app}";
IconFilename: "{app}\wesnoth.ico"; Components: "Processor\K6"
+Name: "{userdesktop}\Battle for Wesnoth"; Filename:
"{app}\bin\wesnoth_athlon.exe"; Tasks: desktopicon; WorkingDir: "{app}";
IconFilename: "{app}\wesnoth.ico"; Components: "Processor\Athlon"
+Name: "{userdesktop}\Battle for Wesnoth (All Processors)"; Filename:
"{app}\bin\wesnoth.exe"; Tasks: desktopicon; WorkingDir: "{app}"; IconFilename:
"{app}\wesnoth.ico"; Components: "Main"
[Run]
-Filename: "{app}\wesnoth.exe"; Description: "Launch Battle for Wesnoth";
Flags: nowait postinstall skipifsilent; WorkingDir: "{app}"
+Filename: "{app}\bin\wesnoth_i486.exe"; Description: "Launch Battle for
Wesnoth"; Flags: nowait postinstall skipifsilent; WorkingDir: "{app}";
Components: "Processor\486"
+Filename: "{app}\bin\wesnoth_p2.exe"; Description: "Launch Battle for
Wesnoth"; Flags: nowait postinstall skipifsilent; WorkingDir: "{app}";
Components: "Processor\P2"
+Filename: "{app}\bin\wesnoth_p4.exe"; Description: "Launch Battle for
Wesnoth"; Flags: nowait postinstall skipifsilent; WorkingDir: "{app}";
Components: "Processor\P4"
+Filename: "{app}\bin\wesnoth_k6.exe"; Description: "Launch Battle for
Wesnoth"; Flags: nowait postinstall skipifsilent; WorkingDir: "{app}";
Components: "Processor\K6"
+Filename: "{app}\bin\wesnoth_athlon.exe"; Description: "Launch Battle for
Wesnoth"; Flags: nowait postinstall skipifsilent; WorkingDir: "{app}";
Components: "Processor\Athlon"
+[Types]
+Name: "full"; Description: "Wesnoth complete installation"; Flags: iscustom
+
+[Components]
+Name: "Main"; Description: "Main Application"; Types: full; Flags: fixed
+Name: "Processor"; Description: "Processor Optimization"; Types: full; Flags:
fixed
+Name: "Processor\All"; Description: "All CPU's"; Types: full; Flags: fixed
+Name: "Processor\486"; Description: "Intel 486"; Types: full; Flags: exclusive
+Name: "Processor\P2"; Description: "Intel Pentium 2"; Types: full; Flags:
exclusive
+Name: "Processor\P4"; Description: "Intel Pentium 4"; Types: full; Flags:
exclusive
+Name: "Processor\K6"; Description: "AMD K6"; Types: full; Flags: exclusive
+Name: "Processor\Athlon"; Description: "AMD Athlon"; Types: full; Flags:
exclusive
+
_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits
