From f1fdc4dd16bcf9ff0db212e4f3ea98b01e155628 Mon Sep 17 00:00:00 2001 From: Thomas Kowaliczek Date: Sat, 3 Dec 2016 16:39:46 +0100 Subject: [PATCH] =?UTF-8?q?change=20to=20fifeengine=20msi=20installer=20an?= =?UTF-8?q?d=20comment=20out=20demos=20and=20tools=20be=E2=80=A6=20(#5)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * change to fifeengine msi installer and comment out demos and tools because we dont have in the installer yet. * trigger appveyor rebuild * forgot to remove the demos on one position * I hope that the build is now fixed. * Try fixing to excute msi files. --- appveyor.yml | 1 - build-scripts/2-extract.bat | 4 ++-- build-scripts/3-copy.bat | 4 ++-- download-lists/fifengine.txt | 6 +++--- installer/fife-sdk.iss | 16 ++++++++-------- 5 files changed, 15 insertions(+), 16 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index a7ed144..aceec8d 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -27,4 +27,3 @@ build_script: after_build: - appveyor PushArtifact "%APPVEYOR_BUILD_FOLDER%\_build\FifeSDK-%APPVEYOR_BUILD_VERSION%-Setup-VC14-x86.exe" - diff --git a/build-scripts/2-extract.bat b/build-scripts/2-extract.bat index 4c1b453..487a52e 100644 --- a/build-scripts/2-extract.bat +++ b/build-scripts/2-extract.bat @@ -45,8 +45,8 @@ echo Fifengine Dependencies echo. echo Fifengine Python27 Installer -copy libfife.win32-py2.7.exe "%TARGET_DIR%\libfife.win32-py2.7.exe" +copy libfife.win32-py2.7.msi "%TARGET_DIR%\libfife.win32-py2.7.msi" dir "%TARGET_DIR%" -popd \ No newline at end of file +popd diff --git a/build-scripts/3-copy.bat b/build-scripts/3-copy.bat index 41041cc..67aed3c 100644 --- a/build-scripts/3-copy.bat +++ b/build-scripts/3-copy.bat @@ -32,6 +32,6 @@ echo Fifengine Dependencies move "%EXTRACTED_DIR%\fifengine-includes" "%TARGET_DIR%" echo Fifengine Python27 Installer -move "%EXTRACTED_DIR%\libfife.win32-py2.7.exe" "%TARGET_DIR%" +move "%EXTRACTED_DIR%\libfife.win32-py2.7.msi" "%TARGET_DIR%" -popd \ No newline at end of file +popd diff --git a/download-lists/fifengine.txt b/download-lists/fifengine.txt index 169043c..536280c 100644 --- a/download-lists/fifengine.txt +++ b/download-lists/fifengine.txt @@ -9,11 +9,11 @@ # # Fifengine Dependencies (libfife-dependencies) -https://ci.appveyor.com/api/buildjobs/u9kltpny74p2gulf/artifacts/libfife-dependencies-dev-dbb9631-VC14.zip +https://ci.appveyor.com/api/buildjobs/eevo7jk07ukw9cj1/artifacts/libfife-dependencies-dev-1979e77-VC14.zip dir=downloads out=libfife-dependencies.zip # Fifengine - Python Installer -https://ci.appveyor.com/api/buildjobs/u9kltpny74p2gulf/artifacts/libfife-dev-dbb9631.win32-py2.7.exe +https://ci.appveyor.com/api/buildjobs/eevo7jk07ukw9cj1/artifacts/libfife-0.4.0.win32-py2.7.msi dir=downloads - out=libfife.win32-py2.7.exe + out=libfife.win32-py2.7.msi diff --git a/installer/fife-sdk.iss b/installer/fife-sdk.iss index 3d48d15..795df9f 100644 --- a/installer/fife-sdk.iss +++ b/installer/fife-sdk.iss @@ -84,16 +84,17 @@ Name: "english"; MessagesFile: "compiler:Default.isl" Name: "full"; Description: "Full installation (build-tools, engine, dependencies, demos, tools)" Name: "build-tools"; Description: "Build-tools only (CMake, Python, Boost, Swig)" Name: "fife-only"; Description: "Engine only" -Name: "fife-demos"; Description: "Engine and Demos" -Name: "fife-tools"; Description: "Engine and Tools" +;Name: "fife-demos"; Description: "Engine and Demos" +;Name: "fife-tools"; Description: "Engine and Tools" Name: "custom"; Description: "Custom installation"; Flags: iscustom ; Define components to install [Components] -Name: fifengine; Description: "[fifengine] Fifengine - Isometric Game Engine"; Types: full fife-only fife-demos +Name: fifengine; Description: "[fifengine] Fifengine - Isometric Game Engine"; Types: full fife-only +;Name: fifengine; Description: "[fifengine] Fifengine - Isometric Game Engine"; Types: full fife-only fife-demos Name: dependencies; Description: "[fifengine] Dependencies"; Types: full -Name: demos; Description: "[fifengine] Demos"; Types: full fife-demos -Name: tools; Description: "[fifengine] Tools"; Types: full fife-tools +;Name: demos; Description: "[fifengine] Demos"; Types: full fife-demos +;Name: tools; Description: "[fifengine] Tools"; Types: full fife-tools Name: cmake; Description: "[build tools] CMake - build system"; Types: full build-tools Name: "Python"; Description: "[build tools] Python - programming language"; Name: "Python\py27"; Description: "[build tools] Python v2.7"; Types: full build-tools; Flags: exclusive @@ -101,7 +102,7 @@ Name: "Python\py35"; Description: "[build tools] Python v3.5"; Name: swig; Description: "[build tools] SWIG - interface generator"; Types: full build-tools [Files] -Source: "..\repackage\libfife.win32-py2.7.exe"; DestDir: "{tmp}"; Flags: recursesubdirs; Components: fifengine +Source: "..\repackage\libfife.win32-py2.7.msi"; DestDir: "{tmp}"; Flags: recursesubdirs; Components: fifengine Source: "..\repackage\fifengine-includes\*"; DestDir: "{app}\fifengine-includes"; Flags: recursesubdirs; Components: dependencies Source: "..\repackage\cmake\*"; DestDir: "{app}\cmake"; Flags: recursesubdirs; Components: cmake Source: "..\repackage\swig\*"; DestDir: "{app}\swig"; Flags: recursesubdirs; Components: swig @@ -113,5 +114,4 @@ Source: "C:\Python35\*"; DestDir: "{app}\python"; ; Define items to run automatically... [Run] ; install "libfife for python2.7" only when "python27" and "fifengine" are selected -Filename: "{tmp}\libfife.win32-py2.7.exe"; Components: Python\py27 and fifengine - +Filename: "msiexec.exe"; Parameters: "/i ""{tmp}\libfife.win32-py2.7.msi"""; Components: Python\py27 and fifengine