Permalink
Browse files

Fix windows builds

  • Loading branch information...
danielepantaleone committed Mar 9, 2018
1 parent 280e850 commit af1dba37ab8c5c1de93cbdd81bafcf3846956ca4
Showing with 9 additions and 17 deletions.
  1. +1 −1 .bumpversion.cfg
  2. +1 −1 b3/PKG-INFO
  3. +1 −1 build-requirements.txt
  4. +3 −9 installer/innosetup/b3-installer-project.iss
  5. +1 −1 installer/innosetup/build.yaml
  6. +2 −4 setup.py
@@ -1,5 +1,5 @@
[bumpversion]
current_version = 1.11
current_version = 1.12
tag = True
commit = True
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: b3
Version: 1.11
Version: 1.12
Summary: BigBrotherBot (B3) is a cross-platform, cross-game game administration bot. Features in-game administration of game servers, multiple user access levels, and database storage. Currently include parsers for Call of Duty 1 to 8, Urban Terror (ioUrT 4.1 and 4.2), BF3, Arma II, CS:GO, Red Orchestra 2, BFBC2, MOH 2010, World of Padman, ETpro, Smokin' Guns, HomeFront, Open Arena, Altitude.
Home-page: http://www.bigbrotherbot.net
Author: Michael Thornton (ThorN), Tim ter Laak (ttlogic), Mark Weirath (xlr8or), Thomas Leveil (Courgette)
@@ -7,7 +7,7 @@
pip>=1.4
setuptools>=0.9
wheel>=0.21
cx_Freeze==4.3.4
cx_Freeze==4.3.3
pyyaml
# popular 3rd party plugins requirements to be included in the frozen builds
@@ -81,10 +81,7 @@ Name: "spanish"; MessagesFile: "compiler:Languages\Spanish.isl"
Name: "ukrainian"; MessagesFile: "compiler:Languages\Ukrainian.isl"
[Icons]
Name: "{commondesktop}\{cm:executable_console,b3_run}"; Filename: "{app}\b3_run.exe"; WorkingDir: "{app}"; Flags: dontcloseonexit; IconFilename: "{app}\b3.ico"; Comment: "Run BigBrotherBot {#B3_VERSION_NUMBER}{#B3_VERSION_SUFFIX}"
Name: "{group}\{cm:executable_console,b3_run}"; Filename: "{app}\b3_run.exe"; WorkingDir: "{app}"; Flags: dontcloseonexit; IconFilename: "{app}\b3.ico"; Comment: "Run BigBrotherBot {#B3_VERSION_NUMBER}{#B3_VERSION_SUFFIX}"
Name: "{commondesktop}\{cm:executable,b3}"; Filename: "{app}\b3.exe"; WorkingDir: "{app}"; Flags: dontcloseonexit; IconFilename: "{app}\b3.ico"; Comment: "Run BigBrotherBot GUI {#B3_VERSION_NUMBER}{#B3_VERSION_SUFFIX}"
Name: "{group}\{cm:executable,b3}"; Filename: "{app}\b3.exe"; WorkingDir: "{app}"; Flags: dontcloseonexit; IconFilename: "{app}\b3.ico"; Comment: "Run BigBrotherBot GUI {#B3_VERSION_NUMBER}{#B3_VERSION_SUFFIX}"
Name: "{commondesktop}\{cm:executable,b3}"; Filename: "{app}\b3.exe"; WorkingDir: "{app}"; Flags: dontcloseonexit; IconFilename: "{app}\b3.ico"; Comment: "Run BigBrotherBot {#B3_VERSION_NUMBER}{#B3_VERSION_SUFFIX}"
Name: "{group}\{cm:configWizard,Config wizard}"; Filename: "http://config.bigbrotherbot.net/"; Comment: "Run the B3 setup wizard"
Name: "{group}\{cm:B3ConfDir,config}"; \
Filename: "{app}\extplugins\"; \
@@ -110,7 +107,7 @@ Source: ../assets_common\gpl-2.0.txt; DestDir: {app}; DestName: license.txt;
Source: ../assets_common\readme-windows.txt; DestDir: {app}; DestName: readme.txt;
Source: ../assets_common\b3.ico; DestDir: {app}
Source: ../assets_common\b3-plugins-icon.ico; DestDir: {app}
Source: {#B3_BUILD_PATH}\b3_run.exe; DestDir: {app}
Source: {#B3_BUILD_PATH}\b3.exe; DestDir: {app}
Source: {#B3_BUILD_PATH}\b3.exe; DestDir: {app}
Source: {#B3_BUILD_PATH}\PKG-INFO; DestDir: {app}
Source: {#B3_BUILD_PATH}\README.md; DestDir: {app};
@@ -120,9 +117,6 @@ Source: {#B3_BUILD_PATH}\docs\*; DestDir: {app}\docs; Flags: recursesubdirs
Source: {#B3_BUILD_PATH}\sql\*; DestDir: {app}\sql; Flags: recursesubdirs
Source: {#B3_BUILD_PATH}\extplugins\*; DestDir: {app}\extplugins; Flags: recursesubdirs
Source: {#B3_BUILD_PATH}\conf\*; DestDir: {app}\conf; Flags: recursesubdirs
Source: {#B3_BUILD_PATH}\gui\*; DestDir: {app}\gui; Flags: recursesubdirs
Source: {#B3_BUILD_PATH}\imageformats\*; DestDir: {app}\imageformats; Flags: recursesubdirs
Source: {#B3_BUILD_PATH}\platforms\*; DestDir: {app}\platforms; Flags: recursesubdirs
Source: {#B3_BUILD_PATH}\plugins\*; DestDir: {app}\plugins; Flags: recursesubdirs
Source: ../../examples\*; DestDir: "{app}\examples"; Flags: recursesubdirs
@@ -144,7 +138,7 @@ Xlrstats=XLRstats
B3configGenerator=B3 config generator
sql=SQL folder
docs=Docs folder
executable_console=Run B3 (console)
executable=Run B3
[Run]
Filename: "{app}\readme.txt"; Flags: ShellExec SkipIfDoesntExist
@@ -4,4 +4,4 @@ innosetup_scripts:
# where to find the InnoSetup compiler
# you can override this value setting the environment variable ISCC_EXE
iscc: C:\Program Files (x86)\Inno Setup 5\ISCC.exe
iscc: C:\Program Files\Inno Setup 5\ISCC.exe
@@ -73,7 +73,7 @@ def right_cut(text, cut):
return __version__, getPlatform(), right_cut(platform.architecture()[0], 'bit')
b3_version = '1.11'
b3_version = '1.12'
b3_version_info = getB3versionInfo()
PROJECT_DIR = os.path.abspath(os.path.dirname(__file__)) # directory where this file is in
@@ -301,7 +301,7 @@ def make_innosetup(self, current_b3_version_part1, current_b3_version_part2):
executables = [
Executable(
script='b3_run.py',
base='Win32GUI' if getPlatform() == 'nt' else None,
base='console' if getPlatform() == 'nt' else None,
compress=True,
copyDependentFiles=True,
targetName=settings[getPlatform()]['binary_name'],
@@ -413,7 +413,6 @@ def make_innosetup(self, current_b3_version_part1, current_b3_version_part2):
'append_script_to_exe': True,
'packages': [
'b3.lib',
'b3.gui',
'b3.parsers',
'b3.tools',
],
@@ -441,7 +440,6 @@ def make_innosetup(self, current_b3_version_part1, current_b3_version_part2):
('b3/conf/templates', 'conf/templates'),
('b3/conf/templates/autodoc', 'conf/templates/autodoc'),
('b3/extplugins/', 'extplugins'),
('b3/gui/assets', 'gui/assets'),
('b3/plugins/', 'plugins/'),
('b3/sql', 'sql'),
('b3/sql/mysql', 'sql/mysql'),

0 comments on commit af1dba3

Please sign in to comment.