Cleanup, build executable sample on windows

This commit is contained in:
Ugljesa Jovanovic committed 2020-06-13 09:55:09 +02:00
1 parent 291badc149
commit f309f7ffaf
8 files changed
+29 -27

No files matched your search

+4 -4
View File
@@ -8,8 +8,8 @@ cd sodiumWrapper
./makeIos.sh ./makeIos.sh
#now we can do the delegated build of ios and macos libraries #now we can do the delegated build of ios and macos libraries
cd .. cd ..
./gradlew multiplatform-crypto-delegated:publishIosArm32PublicationToMavenRepository \ ./gradlew multiplatform-crypto-delegated:publishIosArm32PublicationToSnapshotRepository \
multiplatform-crypto-delegated:publishIosArm64PublicationToMavenRepository \ multiplatform-crypto-delegated:publishIosArm64PublicationToSnapshotRepository \
multiplatform-crypto-delegated:publishIosX64PublicationToMavenRepository \ multiplatform-crypto-delegated:publishIosX64PublicationToSnapshotRepository \
multiplatform-crypto-delegated:publishMacosX64PublicationToMavenRepository multiplatform-crypto-delegated:publishMacosX64PublicationToSnapshotRepository
set +e set +e
+9 -9
View File
@@ -2,13 +2,13 @@ set -e
#!/bin/sh #!/bin/sh
#this will hopefully download all konan dependancies that we use in the build scripts #this will hopefully download all konan dependancies that we use in the build scripts
./gradlew multiplatform-crypto-api:build ./gradlew multiplatform-crypto-api:build
./gradlew multiplatform-crypto:publishIosArm32PublicationToMavenRepository \ ./gradlew multiplatform-crypto:publishIosArm32PublicationToSnapshotRepository \
multiplatform-crypto:publishIosArm64PublicationToMavenRepository \ multiplatform-crypto:publishIosArm64PublicationToSnapshotRepository \
multiplatform-crypto:publishIosX64PublicationToMavenRepository \ multiplatform-crypto:publishIosX64PublicationToSnapshotRepository \
multiplatform-crypto:publishMacosX64PublicationToMavenRepository \ multiplatform-crypto:publishMacosX64PublicationToSnapshotRepository \
multiplatform-crypto:publishTvosArm64PublicationToMavenRepository \ multiplatform-crypto:publishTvosArm64PublicationToSnapshotRepository \
multiplatform-crypto:publishTvosX64PublicationToMavenRepository \ multiplatform-crypto:publishTvosX64PublicationToSnapshotRepository \
multiplatform-crypto:publishWatchosArm32PublicationToMavenRepository \ multiplatform-crypto:publishWatchosArm32PublicationToSnapshotRepository \
multiplatform-crypto:publishWatchosArm64PublicationToMavenRepository \ multiplatform-crypto:publishWatchosArm64PublicationToSnapshotRepository \
multiplatform-crypto:publishWatchosX86PublicationToMavenRepository multiplatform-crypto:publishWatchosX86PublicationToSnapshotRepository
set +e set +e
+2 -2
View File
@@ -7,6 +7,6 @@ cd sodiumWrapper
./makeTvos.sh ./makeTvos.sh
#now we can do the delegated build of ios and macos libraries #now we can do the delegated build of ios and macos libraries
cd .. cd ..
./gradlew multiplatform-crypto-delegated:publishTvosArm64PublicationToMavenRepository \ ./gradlew multiplatform-crypto-delegated:publishTvosArm64PublicationToSnapshotRepository \
multiplatform-crypto-delegated:publishTvosX64PublicationToMavenRepository multiplatform-crypto-delegated:publishTvosX64PublicationToSnapshotRepository
set +e set +e
+3 -3
View File
@@ -7,7 +7,7 @@ cd sodiumWrapper
./makeWatchos.sh ./makeWatchos.sh
#now we can do the delegated build of ios and macos libraries #now we can do the delegated build of ios and macos libraries
cd .. cd ..
./gradlew multiplatform-crypto-delegated:publishWatchosArm32PublicationToMavenRepository \ ./gradlew multiplatform-crypto-delegated:publishWatchosArm32PublicationToSnapshotRepository \
multiplatform-crypto-delegated:publishWatchosArm64PublicationToMavenRepository \ multiplatform-crypto-delegated:publishWatchosArm64PublicationToSnapshotRepository \
multiplatform-crypto-delegated:publishWatchosX86PublicationToMavenRepository multiplatform-crypto-delegated:publishWatchosX86PublicationToSnapshotRepository
set +e set +e
-1
View File
@@ -1 +0,0 @@
./gradlew publishAllPublicationsToMavenRepository -x publishMetadataPublicationToMavenRepository -x publishKotlinMultiplatformPublicationToMavenRepository
+1 -2
View File
@@ -131,8 +131,7 @@ kotlin {
mingwX64() { mingwX64() {
binaries { binaries {
staticLib { executable {
} }
} }
} }
+1 -1
View File
@@ -1,4 +1,4 @@
set +daae set -e
#!/bin/sh #!/bin/sh
#this will hopefully download all konan dependancies that we use in the build scripts #this will hopefully download all konan dependancies that we use in the build scripts
+9 -5
View File
@@ -1,16 +1,20 @@
set -e set -e
#!/bin/sh #!/bin/sh
#this will hopefully download all konan dependancies that we use in the build scripts #this will hopefully download all konan dependancies that we use in the build scripts
./gradlew multiplatform-crypto-api:build ./gradlew multiplatform-crypto-api:build
#now let's build linux deps
cd sodiumWrapper cd sodiumWrapper
./makeMingwX86-64.sh echo "Starting mingw libsodium build"
./configureMingw64.sh
echo "Configure done"
$GNU_MAKE -j4 -C libsodium clean
$GNU_MAKE -j4 -C libsodium
$GNU_MAKE -j4 -C libsodium install
echo "completed libsodium build"
#now we can do the delegated build #now we can do the delegated build
cd .. cd ..
./gradlew multiplatform-crypto-delegated:build ./gradlew multiplatform-crypto-delegated:build
#and finally pure build #and finally pure build
./gradlew multiplatform-crypto:build ./gradlew multiplatform-crypto:build
./gradlew publishJvmPublicationToSnapshotRepository publishJsPublicationToSnapshotRepository \ ./gradlew publishMingwX64PublicationToSnapshotMavenRepository
publishKotlinMultiplatformPublicationToSnapshotRepository publishLinuxX64PublicationToSnapshotRepository \
publishLinuxArm64PublicationToSnapshotRepository publishMetadataPublicationToSnapshotRepository
set +e set +e