Skip to content

Commit

Permalink
release files
Browse files Browse the repository at this point in the history
  • Loading branch information
Natlies committed Jul 11, 2020
1 parent 9a6b214 commit 618bfb0
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 10 deletions.
8 changes: 6 additions & 2 deletions build-tools/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,13 @@ open cmd
make sure your path includes only 64-bit python, adapt the following line as needed and run:
PATH=C:\Python\Python38\Scripts\;C:\Python\Python38\;C:\Windows\system32;C:\Windows;C:\Windows\System32\Wbem;C:\Windows\System32\WindowsPowerShell\v1.0\;C:\Program Files\Git\cmd
cd c:\empires


PATH=C:\Program Files\Python38\Scripts\;C:\Program Files\Python38\;C:\Windows\system32;C:\Windows;C:\Windows\System32\Wbem;C:\Windows\System32\WindowsPowerShell\v1.0\;C:\Program Files\Git\cmd
cd c:\empires
pip install -r requirements.txt
copy build-tools\empires-server.spec .
pyinstaller empires-server.spec --distpath ..\dist_mini003_x64 --clean
pyinstaller empires-server.spec --distpath ..\dist_mini006_x64 --clean

## 32 bit build:
open another cmd
Expand All @@ -22,7 +26,7 @@ PATH=C:\Python\Python38-32\Scripts\;C:\Python\Python38-32\;C:\Windows\system32;C
cd c:\empires
pip install -r requirements.txt
copy build-tools\empires-server.spec .
pyinstaller empires-server.spec --distpath ..\dist_mini003_x86 --clean
pyinstaller empires-server.spec --distpath ..\dist_mini006_x86 --clean

## Inno Setup installer
open the build-tools/empires_inno_setup.iss file and play it
Expand Down
6 changes: 3 additions & 3 deletions build-tools/empires_inno_setup.iss
Original file line number Diff line number Diff line change
Expand Up @@ -65,10 +65,10 @@ Name: "quicklaunchicon"; Description: "{cm:CreateQuickLaunchIcon}"; GroupDescrip
[Files]
;x64
Source: "C:\empires\redist\vc_redist.x64.exe"; DestDir: "{tmp}"; Check: Is64BitInstallMode; Flags: deleteafterinstall
Source: "C:\dist_mini005_x64\empires-server.exe"; DestDir: "{app}"; Check: Is64BitInstallMode; Flags: ignoreversion
Source: "C:\dist_mini006_x64\empires-server.exe"; DestDir: "{app}"; Check: Is64BitInstallMode; Flags: ignoreversion
;x86
Source: "C:\empires\\redist\vc_redist.x86.exe"; DestDir: "{tmp}"; Check: not Is64BitInstallMode; Flags: deleteafterinstall
Source: "C:\dist_mini005_x86\empires-server.exe"; DestDir: "{app}"; Check: not Is64BitInstallMode; Flags: solidbreak ignoreversion
Source: "C:\dist_mini006_x86\empires-server.exe"; DestDir: "{app}"; Check: not Is64BitInstallMode; Flags: solidbreak ignoreversion
;common
Source: "C:\empires\allies\*"; DestDir: "{userdocs}\My Games\{#MyAppName}\allies"; Flags: solidbreak ignoreversion recursesubdirs createallsubdirs
Source: "C:\empires\assets\*"; DestDir: "{app}\assets"; Flags: ignoreversion recursesubdirs createallsubdirs
Expand Down Expand Up @@ -151,5 +151,5 @@ end;
function VCRedist86NeedsInstall: Boolean;
begin
Result := not VCVersionInstalled(VC_2015_REDIST_X84_MIN);
Result := not VCVersionInstalled(VC_2015_REDIST_X86_MIN);
end;
10 changes: 5 additions & 5 deletions save_migration.py
Original file line number Diff line number Diff line change
Expand Up @@ -44,11 +44,11 @@ def migrate(meta, version, target_version):
session['user_object']["experiments"]["empire_buildable_zrig_master"] = 3
#session['save_version'] = version
if version == "0.06a" and version != target_version: # upcoming 0.07
# create_backup("Update to 0.06a") # for release
# version = "0.07a"
#
pass
# session['user_object']["experiments"]["empire_decorations_master"] = 2
create_backup("Update to 0.06a") # for release

session['user_object']["experiments"]["empire_decorations_master"] = 2
version = "0.06a"
session['save_version'] = version



Expand Down

0 comments on commit 618bfb0

Please sign in to comment.