diff options
| author | Jiyoung Yun <jy910.yun@samsung.com> | 2017-05-10 11:59:48 +0300 |
|---|---|---|
| committer | Jiyoung Yun <jy910.yun@samsung.com> | 2017-05-10 12:52:25 +0300 |
| commit | 0c6f4dfb879f4f519f696cfc2cad986fd3b05a8c (patch) | |
| tree | 7db3fe7f4bb7aa81facbff80f7d7071d43328f5f /cross | |
| parent | 00b2a853429c896eb973ffc1bbff04b186ab5d07 (diff) | |
Use Tizen dotnet-core myget in Tizen CI
Removed related workaround codes
Diffstat (limited to 'cross')
| -rwxr-xr-x | cross/arm32_ci_script.sh | 38 |
1 files changed, 5 insertions, 33 deletions
diff --git a/cross/arm32_ci_script.sh b/cross/arm32_ci_script.sh index 54ceda6752..c9630dc870 100755 --- a/cross/arm32_ci_script.sh +++ b/cross/arm32_ci_script.sh @@ -233,41 +233,13 @@ function cross_build_corefx_with_docker { fi # Cross building corefx with rootfs in Docker - __buildNativeCmd="/opt/corefx/build-native.sh -buildArch=$__buildArch -$__buildConfig -- cross $__verboseFlag" - if [ "$__buildArch" == "arm" ]; then - __buildManagedCmd="./build-managed.sh -$__buildConfig -buildArch=$__buildArch -RuntimeOS=$__runtimeOS" - else - # TODO-armel: We can use same option to arm, i.e. -buildArch and -RuntimeOS options for armel, - # when CoreCLR packages are also available at NuGet server for armel. - __buildManagedCmd="./build-managed.sh -$__buildConfig -BuildPackages=false" - - fi - $__dockerCmd $__buildNativeCmd - $__dockerCmd $__buildManagedCmd - sudo chown -R $(id -u -n) ./bin - if [ "$__buildArch" == "armel" ]; then - # TODO-armel: This is a workaround. We don't need this if we can build managed for armel in above. - # Construct runtime directory - if [[ "$__buildConfig" == "release" ]]; then - __runtimePath="./bin/runtime/netcoreapp-Linux-Release-armel" - __nativePath="./bin/Linux.armel.Release/native" - __managedPath="./bin/runtime/netcoreapp-Linux-Release-x64" - else - __runtimePath="./bin/runtime/netcoreapp-Linux-Debug-armel" - __nativePath="./bin/Linux.armel.Debug/native" - __managedPath="./bin/runtime/netcoreapp-Linux-Debug-x64" - fi + __extraCmd="/p:OverridePackageSource=https://tizen.myget.org/F/dotnet-core/api/v3/index.json" + fi - mkdir $__runtimePath - pushd $__managedPath - rm apphost corerun dotnet - rm *.so - popd - cp $__nativePath/* $__runtimePath/ - mv $__managedPath/* $__runtimePath/ - rmdir $__managedPath - fi + __buildCmd="./build.sh -buildArch=$__buildArch -$__buildConfig -RuntimeOS=$__runtimeOS -- $__extraCmd" + $__dockerCmd $__buildCmd + sudo chown -R $(id -u -n) ./bin } #Define script variables |