From 3a1a381b9ba39f627d38493b7dcb5fd06752432e Mon Sep 17 00:00:00 2001 From: LePresidente Date: Mon, 18 Feb 2019 13:23:21 +0200 Subject: Minor change to CMakeLists.txt to use the DEPENDENCY_DIR variable from umbrella, instead of relative paths, this is required to support appveyor. --- src/CMakeLists.txt | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 5cbd5aa9..653aca16 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -250,7 +250,8 @@ SOURCE_GROUP(Headers FILES ${organizer_HDRS}) SOURCE_GROUP(UI FILES ${organizer_UIS}) # MO projects -SET(default_project_path "${CMAKE_SOURCE_DIR}/..") +SET(dependency_project_path "${DEPENDENCIES_DIR}") +SET(default_project_path "${DEPENDENCIES_DIR}/modorganizer_super") GET_FILENAME_COMPONENT(${default_project_path} ${default_project_path} REALPATH) SET(project_path "${default_project_path}" CACHE PATH "path to the other mo projects") @@ -296,7 +297,7 @@ INCLUDE_DIRECTORIES(${project_path}/uibase/src ${project_path}/bsatk/src ${project_path}/esptk/src ${project_path}/archive/src - ${project_path}/../usvfs/include + ${dependency_project_path}/usvfs/include ${project_path}/game_gamebryo/src/gamebryo ${project_path}/game_gamebryo/src/creation ${project_path}/game_features/src -- cgit v1.3.1 From fa9427d22a7828be393e7e2d9d3e7f658b50666d Mon Sep 17 00:00:00 2001 From: LePresidente Date: Mon, 18 Feb 2019 13:50:48 +0200 Subject: Added appveyor build badge to readme.md Added appveyor.yml which will control the appveyor build in the future (currently extremely basic) --- appveyor.yml | 8 ++++++++ readme.md | 3 ++- 2 files changed, 10 insertions(+), 1 deletion(-) create mode 100644 appveyor.yml diff --git a/appveyor.yml b/appveyor.yml new file mode 100644 index 00000000..48511ced --- /dev/null +++ b/appveyor.yml @@ -0,0 +1,8 @@ +version: 1.0.{build} +image: Visual Studio 2017 +build_script: +- cmd: >- + git clone --depth=1 --branch=Appveyor https://github.com/ModOrganizer2/modorganizer-umbrella.git c:\projects\modorganizer-umbrella 2> $null + mkdir c:\projects\modorganizer-build -type directory + cd c:\projects\modorganizer-umbrella + C:\Python37-x64\python.exe unimake.py -d c:\projects\modorganizer-build -s Appveyor_Build=True %APPVEYOR_PROJECT_NAME% diff --git a/readme.md b/readme.md index 8d13b655..ed31f70f 100644 --- a/readme.md +++ b/readme.md @@ -1,3 +1,5 @@ +[![Build status](https://ci.appveyor.com/api/projects/status/23qmd9rufv9vpmg7?svg=true)](https://ci.appveyor.com/project/Modorganizer2/modorganizer) + # Mod Organizer Mod Organizer (MO) is a tool for managing mod collections of arbitrary size. It is specifically designed for people who like to experiment with mods and thus need an easy and reliable way to install and uninstall them. @@ -82,4 +84,3 @@ Here is a complete list: ### Unused Repositories * https://github.com/Modorganizer2/modorganizer-hookdll * https://github.com/TanninOne/modorganizer-tool_nmmimport - -- cgit v1.3.1 From 24ef8c56d272ce6d28135a4848d1abfb7c532072 Mon Sep 17 00:00:00 2001 From: LePresidente Date: Mon, 18 Feb 2019 14:30:26 +0200 Subject: Added blank lines between commands, due to appveyor sees it as a single command --- appveyor.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/appveyor.yml b/appveyor.yml index 48511ced..fa0ca81d 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -3,6 +3,9 @@ image: Visual Studio 2017 build_script: - cmd: >- git clone --depth=1 --branch=Appveyor https://github.com/ModOrganizer2/modorganizer-umbrella.git c:\projects\modorganizer-umbrella 2> $null + mkdir c:\projects\modorganizer-build -type directory + cd c:\projects\modorganizer-umbrella + C:\Python37-x64\python.exe unimake.py -d c:\projects\modorganizer-build -s Appveyor_Build=True %APPVEYOR_PROJECT_NAME% -- cgit v1.3.1 From 63134bc94accd9d7bd66cb1654228fe6c5e3ed47 Mon Sep 17 00:00:00 2001 From: LePresidente Date: Mon, 18 Feb 2019 16:24:03 +0200 Subject: Use same branch on umbrella as the project. --- appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index fa0ca81d..c3299a99 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -2,7 +2,7 @@ version: 1.0.{build} image: Visual Studio 2017 build_script: - cmd: >- - git clone --depth=1 --branch=Appveyor https://github.com/ModOrganizer2/modorganizer-umbrella.git c:\projects\modorganizer-umbrella 2> $null + git clone --depth=1 --branch=%APPVEYOR_REPO_BRANCH% https://github.com/ModOrganizer2/modorganizer-umbrella.git c:\projects\modorganizer-umbrella 2> $null mkdir c:\projects\modorganizer-build -type directory -- cgit v1.3.1 From f0f672f9b7ff01def3b56cb63ce14480ca30e971 Mon Sep 17 00:00:00 2001 From: LePresidente Date: Mon, 18 Feb 2019 16:27:45 +0200 Subject: appveyor really wants those blank lines between commands. --- appveyor.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/appveyor.yml b/appveyor.yml index c3299a99..88530f52 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -2,6 +2,7 @@ version: 1.0.{build} image: Visual Studio 2017 build_script: - cmd: >- + git clone --depth=1 --branch=%APPVEYOR_REPO_BRANCH% https://github.com/ModOrganizer2/modorganizer-umbrella.git c:\projects\modorganizer-umbrella 2> $null mkdir c:\projects\modorganizer-build -type directory -- cgit v1.3.1