diff --git a/packaging/windows/PackageWesnoth.vbs b/packaging/windows/PackageWesnoth.vbs new file mode 100644 index 00000000000..68f9c7a2fb9 --- /dev/null +++ b/packaging/windows/PackageWesnoth.vbs @@ -0,0 +1,92 @@ +Option Explicit + +Dim SourceDirectory, DLLDirectory, GetTextDirectory +Dim DestinationDirectory +Dim PoFile, MoFile, ExecuteString, domains, languages, domain, language +Dim fso, shell + +'on error resume next + +'Initialization +SourceDirectory = "C:\Entwicklung\Wesnoth\wesnoth-1.3.13\" +DLLDirectory = "C:\Entwicklung\Wesnoth\DLL\mingw\" +DestinationDirectory = "C:\Entwicklung\Wesnoth\Release 1.3.13\" +GetTextDirectory = "D:\Programme\GnuWin32\bin\" +Set fso = CreateObject("Scripting.FileSystemObject") +Set shell = CreateObject("WScript.Shell") + +'Copy files +If fso.FolderExists(DestinationDirectory) = False Then + fso.CreateFolder(DestinationDirectory) +End If + +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 + "libiconv2.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(SourceDirectory + "data", DestinationDirectory) +Call fso.CopyFolder(SourceDirectory + "fonts", DestinationDirectory) +Call fso.CopyFolder(SourceDirectory + "images", DestinationDirectory) +Call fso.CopyFolder(SourceDirectory + "sounds", DestinationDirectory) + +If fso.FolderExists(DestinationDirectory + "manual_html") = False Then + Call fso.CreateFolder(DestinationDirectory + "manual_html") +End If +Call fso.CopyFile(SourceDirectory + "doc\manual\manual.en.html", DestinationDirectory + "\manual_html\") +Call fso.CopyFile(SourceDirectory + "doc\manual\manual.cs.html", DestinationDirectory + "\manual_html\") +Call fso.CopyFolder(SourceDirectory + "doc\manual\images", DestinationDirectory + "\manual_html\") +Call fso.CopyFolder(SourceDirectory + "doc\manual\styles", DestinationDirectory + "\manual_html\") + +If fso.FolderExists(DestinationDirectory + "po") = False Then + Call fso.CreateFolder(DestinationDirectory + "po") +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", "ca_ES@valencia", "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", "sr@latin", "sv", "tl", "tr", "zh_CN") + +For Each domain In domains + For Each language In languages + If fso.FolderExists(DestinationDirectory + "po\" + language) = False Then + fso.CreateFolder(DestinationDirectory + "po\" + language) + End If + If fso.FolderExists(DestinationDirectory + "po\" + language + "\LC_MESSAGES") = False Then + fso.CreateFolder(DestinationDirectory + "po\" + language + "\LC_MESSAGES") + End If + + PoFile = SourceDirectory + "po\" + domain + "\" + language + ".po" + MoFile = DestinationDirectory + "po\" + language + "\LC_MESSAGES\" + domain + ".mo" + shell.Run """" + GetTextDirectory + "msgfmt.exe"" " + """" + PoFile + """ -o """ + MoFile + """", 1, True + Next +Next + +Set shell = Nothing +Set fso = Nothing + +MsgBox "Fertig" + diff --git a/packaging/windows/Wesnoth.iss b/packaging/windows/Wesnoth.iss new file mode 100644 index 00000000000..9fa74787080 --- /dev/null +++ b/packaging/windows/Wesnoth.iss @@ -0,0 +1,40 @@ +; Script generated by the Inno Setup Script Wizard. +; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES! + +[Setup] +AppName=Battle for Wesnoth +AppVerName=Battle for Wesnoth 1.3.13 +AppPublisher=David White +AppPublisherURL=http://www.wesnoth.org +AppSupportURL=http://www.wesnoth.org +AppUpdatesURL=http://www.wesnoth.org +DefaultDirName={pf}\Wesnoth +DefaultGroupName=Wesnoth +LicenseFile=C:\Entwicklung\Wesnoth\Release 1.3.13\COPYING +OutputBaseFilename=wesnoth-1.3.13-windows +Compression=lzma +SolidCompression=yes +WizardImageFile=WindowsInstallerGraphic.bmp +WizardSmallImageFile=windows_installer_w_881.bmp + +[Languages] +Name: "english"; MessagesFile: "compiler:Default.isl" + +[Tasks] +Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: unchecked + +[Files] +Source: "C:\Entwicklung\Wesnoth\Release 1.3.13\*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs + +[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}\Uninstall Battle for Wesnoth"; Filename: "{uninstallexe}" +Name: "{userdesktop}\Battle for Wesnoth"; Filename: "{app}\wesnoth.exe"; Tasks: desktopicon; WorkingDir: "{app}"; IconFilename: "{app}\wesnoth.ico" + +[Run] +Filename: "{app}\wesnoth.exe"; Description: "Launch Battle for Wesnoth"; Flags: nowait postinstall skipifsilent; WorkingDir: "{app}" + diff --git a/packaging/windows/WindowsInstallerGraphic.bmp b/packaging/windows/WindowsInstallerGraphic.bmp new file mode 100644 index 00000000000..3ab3da4de5c Binary files /dev/null and b/packaging/windows/WindowsInstallerGraphic.bmp differ diff --git a/packaging/windows/windows_installer_w_881.bmp b/packaging/windows/windows_installer_w_881.bmp new file mode 100644 index 00000000000..b837ab98bba Binary files /dev/null and b/packaging/windows/windows_installer_w_881.bmp differ diff --git a/server.dsp b/server.dsp index 99a7153df08..73bf59a2573 100644 --- a/server.dsp +++ b/server.dsp @@ -1,24 +1,24 @@ # Microsoft Developer Studio Project File - Name="server" - Package Owner=<4> # Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** +# ** NICHT BEARBEITEN ** # TARGTYPE "Win32 (x86) Application" 0x0101 CFG=server - Win32 Release -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run +!MESSAGE Dies ist kein gültiges Makefile. Zum Erstellen dieses Projekts mit NMAKE +!MESSAGE verwenden Sie den Befehl "Makefile exportieren" und führen Sie den Befehl !MESSAGE !MESSAGE NMAKE /f "server.mak". !MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: +!MESSAGE Sie können beim Ausführen von NMAKE eine Konfiguration angeben +!MESSAGE durch Definieren des Makros CFG in der Befehlszeile. Zum Beispiel: !MESSAGE !MESSAGE NMAKE /f "server.mak" CFG="server - Win32 Release" !MESSAGE -!MESSAGE Possible choices for configuration are: +!MESSAGE Für die Konfiguration stehen zur Auswahl: !MESSAGE -!MESSAGE "server - Win32 Debug" (based on "Win32 (x86) Application") -!MESSAGE "server - Win32 Release" (based on "Win32 (x86) Application") +!MESSAGE "server - Win32 Debug" (basierend auf "Win32 (x86) Application") +!MESSAGE "server - Win32 Release" (basierend auf "Win32 (x86) Application") !MESSAGE # Begin Project @@ -43,7 +43,7 @@ RSC=rc.exe # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /GZ /c -# ADD CPP /nologo /MD /W3 /Gm /GR /GX /ZI /Od /I "c:/projects/wesnoth/wesnothd/src" /I "c:/projects/wesnoth/include/SDL-1.2.9/include" /I "c:/projects/wesnoth/include" /I "c:/projects/wesnoth/wesnothd/src/sdl_ttf" /I "c:/program files/python 2.4/include" /I "c:/projects/wesnoth/include/freetype-2.1.9/include" /I "c:/projects/wesnoth/include/freetype-2.1.9/include/freetype" /I "c:/projects/wesnoth/include/SDL_image-1.2.4" /I "c:/projects/wesnoth/include/SDL_mixer-1.2.6" /I "c:/projects/wesnoth/include/SDL_net-1.2.5" /I "src/sdl_ttf" /I "c:/projects/wesnoth/include/libintl-devel/include" /I "c:/usr/include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "NOT_HAVE_FRIBIDI" /FAs /Fa"" /FR"" /Fp"Release/server.pch" /YX /Fo"Release/" /Fd"Release/" /FD /GZ /c +# ADD CPP /nologo /MD /W3 /Gm /GR /GX /ZI /Od /I "c:\Entwicklung\Wesnoth\Wesnoth_SVN_Work\src" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "NOT_HAVE_FRIBIDI" /FAs /Fa"" /FR"" /Fp"Release/server.pch" /YX /Fo"Release/" /Fd"Release/" /FD /GZ /c # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "_DEBUG" diff --git a/wesnoth.dsw b/wesnoth.dsw index f7a5f9b90b1..3275d90192a 100644 --- a/wesnoth.dsw +++ b/wesnoth.dsw @@ -1,5 +1,5 @@ Microsoft Developer Studio Workspace File, Format Version 6.00 -# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE! +# WARNUNG: DIESE ARBEITSBEREICHSDATEI DARF NICHT BEARBEITET ODER GELÖSCHT WERDEN! ############################################################################### @@ -15,19 +15,7 @@ Package=<4> ############################################################################### -Project: "campaign_server"=.\campaign_server\campaign_server.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Project: "server"=.\server.dsp - Package Owner=<4> +Project: "campaign_server"=.\campaign_server.dsp - Package Owner=<4> Package=<5> {{{ @@ -51,6 +39,18 @@ Package=<4> ############################################################################### +Project: "wesnothd"=.\wesnothd.dsp - Package Owner=<4> + +Package=<5> +{{{ +}}} + +Package=<4> +{{{ +}}} + +############################################################################### + Global: Package=<5>