diff --git a/appveyor.yml b/appveyor.yml index 903014e..27ff7fb 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -9,8 +9,11 @@ environment: CHERE_INVOKING: enabled_from_arguments build_script: -- cmd: >- - cd %APPVEYOR_BUILD_FOLDER% +- cmd: cd %APPVEYOR_BUILD_FOLDER% +- curl -o C:\projects\golang.zip https://dl.google.com/go/go1.17.5.windows-amd64.zip +- 7z x C:\projects\golang.zip -oC:\projects\ +- cmd: set PATH=C:\projects\go\bin;%PATH% +- cmd: set GOROOT=C:\projects\go - c:\msys64\usr\bin\bash -lc "./contrib/msi/build-msi.sh x64" - c:\msys64\usr\bin\bash -lc "./contrib/msi/build-msi.sh x86" diff --git a/build b/build index 583bf61..c721443 100755 --- a/build +++ b/build @@ -9,13 +9,11 @@ PKGVER=${PKGVER:-$(sh contrib/semver/version.sh --bare)} LDFLAGS="-X $PKGSRC.buildName=$PKGNAME -X $PKGSRC.buildVersion=$PKGVER" ARGS="-v" -while getopts "uaitc:l:dro:p" option +while getopts "utc:l:dro:p" option do case "$option" in u) UPX=true;; - i) IOS=true;; - a) ANDROID=true;; t) TABLES=true;; c) GCFLAGS="$GCFLAGS $OPTARG";; l) LDFLAGS="$LDFLAGS $OPTARG";; @@ -30,25 +28,11 @@ if [ -z $TABLES ] && [ -z $DEBUG ]; then LDFLAGS="$LDFLAGS -s -w" fi -if [ $IOS ]; then - echo "Building framework for iOS" - go get golang.org/x/mobile/bind - gomobile bind -target ios -tags mobile -o Yggdrasil.framework -ldflags="$LDFLAGS $STRIP" -gcflags="$GCFLAGS" \ - github.com/yggdrasil-network/yggdrasil-extras/src/mobile \ - github.com/yggdrasil-network/yggdrasil-go/src/config -elif [ $ANDROID ]; then - echo "Building aar for Android" - go get golang.org/x/mobile/bind - gomobile bind -target android -tags mobile -o yggdrasil.aar -ldflags="$LDFLAGS $STRIP" -gcflags="$GCFLAGS" \ - github.com/yggdrasil-network/yggdrasil-extras/src/mobile \ - github.com/yggdrasil-network/yggdrasil-go/src/config -else - for CMD in yggdrasil yggdrasilctl ; do - echo "Building: $CMD" - go build $ARGS -ldflags="$LDFLAGS" -gcflags="$GCFLAGS" ./cmd/$CMD +for CMD in yggdrasil yggdrasilctl ; do + echo "Building: $CMD" + go build $ARGS -ldflags="$LDFLAGS" -gcflags="$GCFLAGS" ./cmd/$CMD - if [ $UPX ]; then - upx --brute $CMD - fi - done -fi + if [ $UPX ]; then + upx --brute $CMD + fi +done diff --git a/contrib/macos/create-pkg.sh b/contrib/macos/create-pkg.sh index 919c45e..773f01e 100755 --- a/contrib/macos/create-pkg.sh +++ b/contrib/macos/create-pkg.sh @@ -79,6 +79,7 @@ PKGNAME=$(sh contrib/semver/name.sh) PKGVERSION=$(sh contrib/semver/version.sh --bare) PKGARCH=${PKGARCH-amd64} PAYLOADSIZE=$(( $(wc -c pkgbuild/flat/base.pkg/Payload | awk '{ print $1 }') / 1024 )) +[ "$PKGARCH" = "amd64" ] && PKGHOSTARCH="x86_64" || PKGHOSTARCH=${PKGARCH} # Create the PackageInfo file cat > pkgbuild/flat/base.pkg/PackageInfo << EOF @@ -98,7 +99,7 @@ cat > pkgbuild/flat/Distribution << EOF Yggdrasil (${PKGNAME}-${PKGVERSION}) - +