skylab/MasterPassword
2
0
Fork 0
Code Releases Activity

Update dependent paths to new core source location.

Browse Source
This commit is contained in:
Maarten Billemont 2018-06-05 20:09:13 -04:00
parent c2aafd8602
commit aef8422102
5 changed files with 4 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitlab-ci.yml
View File

@ -7,7 +7,7 @@ build_project:
script: script:
- "( brew install libsodium json-c )" - "( brew install libsodium json-c )"
- "( ./lib/bin/build_libsodium-macos )" - "( ./lib/bin/build_libsodium-macos )"
- "( cd ./platform-independent/cli-c && ./clean && targets='mpw mpw-bench mpw-tests' ./build && ./mpw-tests && ./mpw-cli-tests )" - "( cd ./platform-independent/c/cli && ./clean && targets=all ./build && ./mpw-tests && ./mpw-cli-tests )"
- "( cd ./gradle && ./gradlew --info clean test )" - "( cd ./gradle && ./gradlew --info clean test )"
- "( xcodebuild -workspace platform-darwin/MasterPassword.xcworkspace -configuration 'Test' -scheme 'MasterPassword iOS' -sdk iphonesimulator clean build )" - "( xcodebuild -workspace platform-darwin/MasterPassword.xcworkspace -configuration 'Test' -scheme 'MasterPassword iOS' -sdk iphonesimulator clean build )"
- "( xcodebuild -workspace platform-darwin/MasterPassword.xcworkspace -configuration 'Test' -scheme 'MasterPassword macOS' clean build )" - "( xcodebuild -workspace platform-darwin/MasterPassword.xcworkspace -configuration 'Test' -scheme 'MasterPassword macOS' clean build )"

21
.travis.yml
View File

@ -1,21 +0,0 @@
language: objective-c
os: osx
osx_image: xcode9.2
env: TERM=dumb SHLVL=0
git:
submodules: true
script:
- "( brew install libsodium json-c )"
- "( ./lib/bin/build_libsodium-macos )"
- "( cd ./platform-independent/cli-c && ./clean && targets='mpw mpw-bench mpw-tests' ./build && ./mpw-tests && ./mpw-cli-tests )"
- "( cd ./gradle && ./gradlew --info clean test )"
- "( xcodebuild -workspace platform-darwin/MasterPassword.xcworkspace -configuration 'Test' -scheme 'MasterPassword iOS' -sdk iphonesimulator )"
- "( xcodebuild -workspace platform-darwin/MasterPassword.xcworkspace -configuration 'Test' -scheme 'MasterPassword macOS' )"
notifications:
webhooks:
urls:
- "https://scalar.vector.im/api/neb/services/hooks/dHJhdmlzLWNpLyU0MGxodW5hdGglM0FseW5kaXIuY29tLyUyMWR2S1JpaW1uc0Z3dWdseEpHSyUzQWx5bmRpci5jb20"
on_success: change # always|never|change
on_failure: always
on_start: never

2
platform-darwin/MasterPassword-JNI.xcodeproj/project.pbxproj
View File

@ -62,7 +62,7 @@
DA1554ED20B3928E00EA92C5 /* mpw-util.h */, DA1554ED20B3928E00EA92C5 /* mpw-util.h */,
); );
name = core; name = core;
path = ../core/c/src; path = ../platform-independent/c/core/src;
sourceTree = "<group>"; sourceTree = "<group>";
}; };
/* End PBXGroup section */ /* End PBXGroup section */

2
platform-darwin/MasterPassword-iOS.xcodeproj/project.pbxproj
View File

@ -1783,7 +1783,7 @@
93D39CF7DB942C69D1C5D6BE /* mpw-util.h */, 93D39CF7DB942C69D1C5D6BE /* mpw-util.h */,
); );
name = core; name = core;
path = ../core/c/src; path = ../platform-independent/c/core/src;
sourceTree = "<group>"; sourceTree = "<group>";
}; };
DA0CC4F41EAB99BA009A8ED9 /* Resources */ = { DA0CC4F41EAB99BA009A8ED9 /* Resources */ = {

2
platform-darwin/MasterPassword-macOS.xcodeproj/project.pbxproj
View File

@ -1820,7 +1820,7 @@
DA6773C61A4746AF004F356A /* mpw-util.h */, DA6773C61A4746AF004F356A /* mpw-util.h */,
); );
name = core; name = core;
path = ../core/c/src; path = ../platform-independent/c/core/src;
sourceTree = "<group>"; sourceTree = "<group>";
}; };
DA89D4E51A51E53100AC64D7 /* Pearl-Cocoa */ = { DA89D4E51A51E53100AC64D7 /* Pearl-Cocoa */ = {