From 1cb7906efcc1d217b97a328f0decade1d8cbc43a Mon Sep 17 00:00:00 2001 From: Chris Collins Date: Wed, 14 Oct 2020 10:39:05 +1100 Subject: [PATCH 1/6] update physfs --- conan.lock | 46 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) create mode 100644 conan.lock diff --git a/conan.lock b/conan.lock new file mode 100644 index 0000000..d7e6450 --- /dev/null +++ b/conan.lock @@ -0,0 +1,46 @@ +{ + "profile_host": "[settings]\narch=x86_64\narch_build=x86_64\nbuild_type=Release\ncompiler=Visual Studio\ncompiler.runtime=MD\ncompiler.version=16\nos=Windows\nos_build=Windows\n[options]\n[build_requires]\n[env]\n", + "graph_lock": { + "nodes": { + "0": { + "pref": "sais/None:00df68c2abfcd209e8e65ebc709d840abe2ffba6", + "options": "ogg:shared=False\nphysfs:shared=False\nsdl2:directx=True\nsdl2:iconv=False\nsdl2:opengl=True\nsdl2:opengles=True\nsdl2:sdl2main=True\nsdl2:shared=False\nsdl2_mixer:cmd=False\nsdl2_mixer:flac=False\nsdl2_mixer:fluidsynth=False\nsdl2_mixer:mad=False\nsdl2_mixer:mikmod=False\nsdl2_mixer:modplug=False\nsdl2_mixer:mpg123=False\nsdl2_mixer:nativemidi=True\nsdl2_mixer:ogg=True\nsdl2_mixer:opus=False\nsdl2_mixer:shared=False\nsdl2_mixer:wav=True\nvorbis:shared=False", + "requires": [ + "1", + "2", + "5" + ], + "path": "D:\\Projects\\sais_source20051111\\conanfile.py" + }, + "1": { + "pref": "sdl2/2.0.12@bincrafters/stable#0:fde4abc671a49ddbe46aded4ea793d2156d9ea16", + "options": "directx=True\niconv=False\nopengl=True\nopengles=True\nsdl2main=True\nshared=False" + }, + "2": { + "pref": "sdl2_mixer/2.0.4@bincrafters/stable#0:4a8b018499021da63abe86b0a0206849195732e4", + "options": "cmd=False\nflac=False\nfluidsynth=False\nmad=False\nmikmod=False\nmodplug=False\nmpg123=False\nnativemidi=True\nogg=True\nopus=False\nshared=False\nwav=True\nogg:shared=False\nsdl2:directx=True\nsdl2:iconv=False\nsdl2:opengl=True\nsdl2:opengles=True\nsdl2:sdl2main=True\nsdl2:shared=False\nvorbis:shared=False", + "requires": [ + "1", + "3", + "4" + ] + }, + "3": { + "pref": "ogg/1.3.4#0:3fb49604f9c2f729b85ba3115852006824e72cab#0", + "options": "shared=False" + }, + "4": { + "pref": "vorbis/1.3.6#0:becff00909fb3d957c6b4ca60fa64d4e6a32a540#0", + "options": "shared=False\nogg:shared=False", + "requires": [ + "3" + ] + }, + "5": { + "pref": "physfs/3.0.2@xsquawkbox/testing#276580ebe42819891c4c816372f50228:3fb49604f9c2f729b85ba3115852006824e72cab#f06893feefd51beebba6c9876d61fb58", + "options": "shared=False" + } + } + }, + "version": "0.3" +} \ No newline at end of file From b4f6628c9e886a312263682b2ba05f2e89404050 Mon Sep 17 00:00:00 2001 From: Chris Collins Date: Wed, 14 Oct 2020 10:43:36 +1100 Subject: [PATCH 2/6] flip to physfs 3.0.2 --- conanfile.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conanfile.py b/conanfile.py index 529205c..a1bbe5f 100644 --- a/conanfile.py +++ b/conanfile.py @@ -8,7 +8,7 @@ class SaisConan(ConanFile): requires = [ 'sdl2/2.0.12@bincrafters/stable', 'sdl2_mixer/2.0.4@bincrafters/stable', - 'physfs/3.0.1@bincrafters/stable', + 'physfs/3.0.2@xsquawkbox/testing', ] default_options = { "*:shared": False, From c682415313c258f7625a91ec01332677ecf23db3 Mon Sep 17 00:00:00 2001 From: Chris Collins Date: Wed, 14 Oct 2020 13:31:31 +1100 Subject: [PATCH 3/6] Include conan remote config --- Jenkinsfile | 6 ++++++ conan.lock | 46 ---------------------------------------------- conan/remotes.txt | 3 +++ 3 files changed, 9 insertions(+), 46 deletions(-) delete mode 100644 conan.lock create mode 100644 conan/remotes.txt diff --git a/Jenkinsfile b/Jenkinsfile index 3c52e4c..e55d939 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -34,6 +34,9 @@ pipeline { label 'macos' } steps { + sh ''' + conan config install "${WORKSPACE}/saisgpl/conan" + ''' dir('saisgpl.m64') { deleteDir() sh ''' @@ -101,6 +104,9 @@ pipeline { label 'windows' } steps { + bat ''' + conan config install %WORKSPACE%\\xsb\\conan + ''' dir('saisgpl.w64') { deleteDir() bat ''' diff --git a/conan.lock b/conan.lock deleted file mode 100644 index d7e6450..0000000 --- a/conan.lock +++ /dev/null @@ -1,46 +0,0 @@ -{ - "profile_host": "[settings]\narch=x86_64\narch_build=x86_64\nbuild_type=Release\ncompiler=Visual Studio\ncompiler.runtime=MD\ncompiler.version=16\nos=Windows\nos_build=Windows\n[options]\n[build_requires]\n[env]\n", - "graph_lock": { - "nodes": { - "0": { - "pref": "sais/None:00df68c2abfcd209e8e65ebc709d840abe2ffba6", - "options": "ogg:shared=False\nphysfs:shared=False\nsdl2:directx=True\nsdl2:iconv=False\nsdl2:opengl=True\nsdl2:opengles=True\nsdl2:sdl2main=True\nsdl2:shared=False\nsdl2_mixer:cmd=False\nsdl2_mixer:flac=False\nsdl2_mixer:fluidsynth=False\nsdl2_mixer:mad=False\nsdl2_mixer:mikmod=False\nsdl2_mixer:modplug=False\nsdl2_mixer:mpg123=False\nsdl2_mixer:nativemidi=True\nsdl2_mixer:ogg=True\nsdl2_mixer:opus=False\nsdl2_mixer:shared=False\nsdl2_mixer:wav=True\nvorbis:shared=False", - "requires": [ - "1", - "2", - "5" - ], - "path": "D:\\Projects\\sais_source20051111\\conanfile.py" - }, - "1": { - "pref": "sdl2/2.0.12@bincrafters/stable#0:fde4abc671a49ddbe46aded4ea793d2156d9ea16", - "options": "directx=True\niconv=False\nopengl=True\nopengles=True\nsdl2main=True\nshared=False" - }, - "2": { - "pref": "sdl2_mixer/2.0.4@bincrafters/stable#0:4a8b018499021da63abe86b0a0206849195732e4", - "options": "cmd=False\nflac=False\nfluidsynth=False\nmad=False\nmikmod=False\nmodplug=False\nmpg123=False\nnativemidi=True\nogg=True\nopus=False\nshared=False\nwav=True\nogg:shared=False\nsdl2:directx=True\nsdl2:iconv=False\nsdl2:opengl=True\nsdl2:opengles=True\nsdl2:sdl2main=True\nsdl2:shared=False\nvorbis:shared=False", - "requires": [ - "1", - "3", - "4" - ] - }, - "3": { - "pref": "ogg/1.3.4#0:3fb49604f9c2f729b85ba3115852006824e72cab#0", - "options": "shared=False" - }, - "4": { - "pref": "vorbis/1.3.6#0:becff00909fb3d957c6b4ca60fa64d4e6a32a540#0", - "options": "shared=False\nogg:shared=False", - "requires": [ - "3" - ] - }, - "5": { - "pref": "physfs/3.0.2@xsquawkbox/testing#276580ebe42819891c4c816372f50228:3fb49604f9c2f729b85ba3115852006824e72cab#f06893feefd51beebba6c9876d61fb58", - "options": "shared=False" - } - } - }, - "version": "0.3" -} \ No newline at end of file diff --git a/conan/remotes.txt b/conan/remotes.txt new file mode 100644 index 0000000..d6fe71f --- /dev/null +++ b/conan/remotes.txt @@ -0,0 +1,3 @@ +conan-center https://conan.bintray.com True +bincrafters https://api.bintray.com/conan/bincrafters/public-conan True +xsquawkbox-public https://api.bintray.com/conan/akuneko/xsquawkbox True From abb2a9b8fb85825649c2c96251465d50dd84da42 Mon Sep 17 00:00:00 2001 From: Chris Collins Date: Wed, 14 Oct 2020 13:35:49 +1100 Subject: [PATCH 4/6] fix conan path on macos build --- Jenkinsfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Jenkinsfile b/Jenkinsfile index e55d939..1c9866c 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -35,6 +35,7 @@ pipeline { } steps { sh ''' + export PATH=/usr/local/bin:$PATH conan config install "${WORKSPACE}/saisgpl/conan" ''' dir('saisgpl.m64') { From eaacbb5905952b19f96f06692646fafca5b825b2 Mon Sep 17 00:00:00 2001 From: Chris Collins Date: Wed, 14 Oct 2020 13:38:22 +1100 Subject: [PATCH 5/6] Fix conan config install on windows. --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 1c9866c..f1febaf 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -106,7 +106,7 @@ pipeline { } steps { bat ''' - conan config install %WORKSPACE%\\xsb\\conan + conan config install %WORKSPACE%\\saisgpl\\conan ''' dir('saisgpl.w64') { deleteDir() From 88c674c7f08e4399469be73968daca2e7ef3580b Mon Sep 17 00:00:00 2001 From: Chris Collins Date: Wed, 14 Oct 2020 13:52:21 +1100 Subject: [PATCH 6/6] Include conan profiles. --- Jenkinsfile | 4 ++-- conan/profiles/release-m64 | 13 +++++++++++++ conan/profiles/release-w64 | 12 ++++++++++++ 3 files changed, 27 insertions(+), 2 deletions(-) create mode 100644 conan/profiles/release-m64 create mode 100644 conan/profiles/release-w64 diff --git a/Jenkinsfile b/Jenkinsfile index f1febaf..793f0eb 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -43,7 +43,7 @@ pipeline { sh ''' export PATH=/usr/local/bin:$PATH export MACOS_DEPLOYMENT_TARGET=10.11 - conan install ../saisgpl --build --update --profile=default -s os.version=10.11 + conan install ../saisgpl --build --update --profile=release-m64 ''' } cmakeBuild buildDir: 'saisgpl.m64', @@ -111,7 +111,7 @@ pipeline { dir('saisgpl.w64') { deleteDir() bat ''' - conan install ..\\saisgpl --build=outdated --build=cascade --update --profile=default -s compiler.runtime=MT + conan install ..\\saisgpl --build=outdated --build=cascade --update --profile=release-w64 ''' } cmakeBuild generator: 'Visual Studio 16 2019', diff --git a/conan/profiles/release-m64 b/conan/profiles/release-m64 new file mode 100644 index 0000000..fa5ee59 --- /dev/null +++ b/conan/profiles/release-m64 @@ -0,0 +1,13 @@ +[settings] +os=Macos +os.version=10.11 +os_build=Macos +arch=x86_64 +arch_build=x86_64 +compiler=apple-clang +compiler.version=11.0 +compiler.libcxx=libc++ +build_type=Release +[options] +[build_requires] +[env] diff --git a/conan/profiles/release-w64 b/conan/profiles/release-w64 new file mode 100644 index 0000000..9241785 --- /dev/null +++ b/conan/profiles/release-w64 @@ -0,0 +1,12 @@ +[settings] +os=Windows +os_build=Windows +compiler=Visual Studio +compiler.version=16 +compiler.runtime=MT +build_type=Release +arch=x86_64 +arch_build=x86_64 +[options] +[build_requires] +[env]