diff --git a/tools/build-deb.sh b/tools/build-deb.sh deleted file mode 100755 index 6e3755ba..00000000 --- a/tools/build-deb.sh +++ /dev/null @@ -1,74 +0,0 @@ -# Builds three .deb packages, for x86 (i386) and x86_64 (amd64) and arm (arm) -# These packages include a manpage, an icon, and a desktop file. - -function getControl() { -echo Section: editors -echo Package: micro -echo Version: $2 -echo Priority: extra -echo Maintainer: \"Zachary Yedidia\" \ -echo Standards-Version: 3.9.8 -echo Homepage: https://micro-editor.github.io/ -echo Architecture: $1 -echo "Description: A modern and intuitive terminal-based text editor" -echo " This package contains a modern alternative to other terminal-based" -echo " Editors. It is easy to Use, highly customizable via themes and plugins" -echo " and it supports mouse input" -} - -function installFiles() { - TO="$1/$2/usr/share/doc/micro/" - mkdir -p $TO - mkdir -p "$1/$2/usr/share/man/man1/" - mkdir -p "$1/$2/usr/share/applications/" - mkdir -p "$1/$2/usr/share/icons/" - cp ../LICENSE $TO - cp ../LICENSE-THIRD-PARTY $TO - cp ../README.md $TO - gzip -c ../assets/packaging/micro.1 > $1/$2/usr/share/man/man1/micro.1.gz - cp ../assets/packaging/micro.desktop $1/$2/usr/share/applications/ - cp ../assets/logo.svg $1/$2/usr/share/icons/micro.svg -} - -version=$1 -if [ "$1" == "" ] - then - version=$(go run build-version.go | tr "-" ".") -fi -echo "Building packages for Version '$version'" -echo "Compiling." -./compile-linux.sh $version - -echo "Beginning package build process" - -PKGPATH="../packages/deb" - -rm -fr $PKGPATH -mkdir -p $PKGPATH/amd64/DEBIAN/ -mkdir -p $PKGPATH/i386/DEBIAN/ -mkdir -p $PKGPATH/arm/DEBIAN/ - -getControl "amd64" "$version" > $PKGPATH/amd64/DEBIAN/control -tar -xzf "../binaries/micro-$version-linux64.tar.gz" "micro-$version/micro" -mkdir -p $PKGPATH/amd64/usr/local/bin/ -mv "micro-$version/micro" "$PKGPATH/amd64/usr/local/bin/" - -getControl "i386" "$version" > $PKGPATH/i386/DEBIAN/control -tar -xzf "../binaries/micro-$version-linux32.tar.gz" "micro-$version/micro" -mkdir -p $PKGPATH/i386/usr/local/bin/ -mv "micro-$version/micro" "$PKGPATH/i386/usr/local/bin/" - -getControl "arm" "$version" > $PKGPATH/arm/DEBIAN/control -tar -xzf "../binaries/micro-$version-linux-arm.tar.gz" "micro-$version/micro" -mkdir -p $PKGPATH/arm/usr/local/bin -mv "micro-$version/micro" "$PKGPATH/arm/usr/local/bin" - -rm -rf "micro-$version" - -installFiles $PKGPATH "amd64" -installFiles $PKGPATH "i386" -installFiles $PKGPATH "arm" - -dpkg -b "$PKGPATH/amd64/" "../packages/micro-$version-amd64.deb" -dpkg -b "$PKGPATH/i386/" "../packages/micro-$version-i386.deb" -dpkg -b "$PKGPATH/arm/" "../packages/micro-$version-arm.deb" diff --git a/tools/build-packages.sh b/tools/build-packages.sh deleted file mode 100755 index b827afa7..00000000 --- a/tools/build-packages.sh +++ /dev/null @@ -1,129 +0,0 @@ -#Builds all packages we support - -version=$1 -if [ "$1" == "" ] - then - version=$(go run build-version.go | tr "-" ".") -fi -echo "Building packages for Version '$version'" -echo "Compiling." -./compile-linux.sh $version - -#Build the debs -function getControl() { -echo Section: editors -echo Package: micro -echo Version: $2 -echo Priority: extra -echo Maintainer: \"Zachary Yedidia\" \ -echo Standards-Version: 3.9.8 -echo Homepage: https://micro-editor.github.io/ -echo Architecture: $1 -echo "Description: A modern and intuitive terminal-based text editor" -echo " This package contains a modern alternative to other terminal-based" -echo " Editors. It is easy to Use, highly customizable via themes and plugins" -echo " and it supports mouse input" -} - -function installFiles() { - TO="$1/$2/usr/share/doc/micro/" - mkdir -p $TO - mkdir -p "$1/$2/usr/share/man/man1/" - mkdir -p "$1/$2/usr/share/applications/" - mkdir -p "$1/$2/usr/share/icons/" - cp ../LICENSE $TO - cp ../LICENSE-THIRD-PARTY $TO - cp ../README.md $TO - gzip -c ../assets/packaging/micro.1 > $1/$2/usr/share/man/man1/micro.1.gz - cp ../assets/packaging/micro.desktop $1/$2/usr/share/applications/ - cp ../assets/logo.svg $1/$2/usr/share/icons/micro.svg -} -echo "Starting deb build process" -PKGPATH="../packages/deb" -rm -fr $PKGPATH -mkdir -p $PKGPATH/amd64/DEBIAN/ -mkdir -p $PKGPATH/i386/DEBIAN/ -mkdir -p $PKGPATH/arm/DEBIAN/ - -getControl "amd64" "$version" > $PKGPATH/amd64/DEBIAN/control -tar -xzf "../binaries/micro-$version-linux64.tar.gz" "micro-$version/micro" -mkdir -p $PKGPATH/amd64/usr/local/bin/ -mv "micro-$version/micro" "$PKGPATH/amd64/usr/local/bin/" - -getControl "i386" "$version" > $PKGPATH/i386/DEBIAN/control -tar -xzf "../binaries/micro-$version-linux32.tar.gz" "micro-$version/micro" -mkdir -p $PKGPATH/i386/usr/local/bin/ -mv "micro-$version/micro" "$PKGPATH/i386/usr/local/bin/" - -getControl "arm" "$version" > $PKGPATH/arm/DEBIAN/control -tar -xzf "../binaries/micro-$version-linux-arm.tar.gz" "micro-$version/micro" -mkdir -p $PKGPATH/arm/usr/local/bin -mv "micro-$version/micro" "$PKGPATH/arm/usr/local/bin" - -rm -rf "micro-$version" - -installFiles $PKGPATH "amd64" -installFiles $PKGPATH "i386" -installFiles $PKGPATH "arm" - -echo "Building debs" -dpkg -b "$PKGPATH/amd64/" "../packages/micro-$version-amd64.deb" -dpkg -b "$PKGPATH/i386/" "../packages/micro-$version-i386.deb" -dpkg -b "$PKGPATH/arm/" "../packages/micro-$version-arm.deb" - -#Build the RPMS -echo "Starting RPM build process" -PKGPATH="../packages/rpm" - -rm -rf $PKGPATH -mkdir -p $PKGPATH - -versionsplit=$(echo $version | tr "." "\n") -version="" -i=0 -for string in $versionsplit -do - if (("$i" < "2")) - then - version=$(echo $version$string.) - fi - if (("$i" == "2")) - then - version=$(echo $version$string) - fi - if (("$i" == "3")) - then - dev=$(echo $dev$string.) - fi - if (("$i"=="4")) - then - dev=$(echo $dev$string) - fi - let "i+=1" -done - -#Generate the spec file from template -cat micro.spec | sed s/"dev.126"/"$dev"/ | sed s/"Version: 1.1.5"/"Version: $version"/ | sed s/"-Version: 1.1.5"/"-Version: $version"/ | sed s/"DATE"/"$(date +%F\ %H:%m)"/ | sed s/"rdieter1@localhost.localdomain"/"$USER@$HOSTNAME"/ | tee > $PKGPATH/micro.spec - -cd $PKGPATH - -echo "Building the RPM packages" -rpmbuild -bs micro.spec --define "_sourcedir $(pwd)/../../binaries/" --define "_rpmdir $(pwd)/../" -rpmbuild -bb micro.spec --define "_sourcedir $(pwd)/../../binaries/" --define "_rpmdir $(pwd)/../" --target x86_64 -rpmbuild -bb micro.spec --define "_sourcedir $(pwd)/../../binaries/" --define "_rpmdir $(pwd)/../" --target i686 -rpmbuild -bb micro.spec --define "_sourcedir $(pwd)/../../binaries/" --define "_rpmdir $(pwd)/../" --target armv7l - -cd .. - -mv x86_64/micro-$version-1.$dev.x86_64.rpm ./ -mv i686/micro-$version-1.$dev.i686.rpm ./ -mv armv7l/micro-$version-1.$dev.armv7l.rpm ./ - -echo "Cleaning up." -rm -rf x86_64 -rm -rf i686 -rm -rf armv7l -rm -rf rpm -rm -rf deb - -echo "Your packages should be ready now. Thank you, have a nice day. :)" diff --git a/tools/build-rpm.sh b/tools/build-rpm.sh deleted file mode 100755 index f910cb4a..00000000 --- a/tools/build-rpm.sh +++ /dev/null @@ -1,59 +0,0 @@ -#This script builds four rpm packages -#One for x86 (i386) and x86_64 (amd64) and arm (armv7l) -#and one containing the source tarball -version=$1 -if [ "$1" == "" ] - then - version=$(go run build-version.go | tr "-" ".") -fi -echo "Building packages for Version '$version'" -echo "Compiling." -./compile-linux.sh $version - -PKGPATH="../packages/rpm" - -rm -rf $PKGPATH -mkdir -p $PKGPATH -versionsplit=$(echo $version | tr "." "\n") -version="" -i=0 -for string in $versionsplit -do - if (("$i" < "2")) - then - version=$(echo $version$string.) - fi - if (("$i" == "2")) - then - version=$(echo $version$string) - fi - if (("$i" == "3")) - then - dev=$(echo $dev$string.) - fi - if (("$i"=="4")) - then - dev=$(echo $dev$string) - fi - let "i+=1" -done -echo "Starting the packaging process" -#Generate the spec file -cat micro.spec | sed s/"dev.126"/"$dev"/ | sed s/"Version: 1.1.5"/"Version: $version"/ | sed s/"-Version: 1.1.5"/"-Version: $version"/ | sed s/"DATE"/"$(date +%F\ %H:%m)"/ | sed s/"rdieter1@localhost.localdomain"/"$USER@$HOSTNAME"/ | tee > $PKGPATH/micro.spec - -cd $PKGPATH - -rpmbuild -bs micro.spec --define "_sourcedir $(pwd)/../../binaries/" --define "_rpmdir $(pwd)/../" -rpmbuild -bb micro.spec --define "_sourcedir $(pwd)/../../binaries/" --define "_rpmdir $(pwd)/../" --target x86_64 -rpmbuild -bb micro.spec --define "_sourcedir $(pwd)/../../binaries/" --define "_rpmdir $(pwd)/../" --target i686 -rpmbuild -bb micro.spec --define "_sourcedir $(pwd)/../../binaries/" --define "_rpmdir $(pwd)/../" --target armv7l - -cd .. - -mv x86_64/micro-$version-1.$dev.x86_64.rpm ./ -mv i686/micro-$version-1.$dev.i686.rpm ./ -mv armv7l/micro-$version-1.$dev.armv7l.rpm ./ - -rm -rf x86_64 -rm -rf i686 -rm -rf armv7l diff --git a/tools/compile-linux.sh b/tools/compile-linux.sh index 0bdd87de..f2e5498e 100755 --- a/tools/compile-linux.sh +++ b/tools/compile-linux.sh @@ -1,6 +1,4 @@ -# Source tar - -./vendor-src.sh micro-$1-src +# ./vendor-src.sh micro-$1-src cd .. mkdir -p binaries @@ -26,9 +24,13 @@ echo "Linux 32" GOOS=linux GOARCH=386 go build -ldflags "-s -w -X main.Version=$1 -X main.CommitHash=$HASH -X 'main.CompileDate=$DATE'" -o micro-$1/micro ./cmd/micro tar -czf micro-$1-linux32.tar.gz micro-$1 mv micro-$1-linux32.tar.gz binaries -echo "Linux arm" +echo "Linux arm 32" GOOS=linux GOARCH=arm go build -ldflags "-s -w -X main.Version=$1 -X main.CommitHash=$HASH -X 'main.CompileDate=$DATE'" -o micro-$1/micro ./cmd/micro tar -czf micro-$1-linux-arm.tar.gz micro-$1 mv micro-$1-linux-arm.tar.gz binaries +echo "Linux arm 64" +GOOS=linux GOARCH=arm64 go build -ldflags "-s -w -X main.Version=$1 -X main.CommitHash=$HASH -X 'main.CompileDate=$DATE'" -o micro-$1/micro ./cmd/micro +tar -czf micro-$1-linux-arm64.tar.gz micro-$1 +mv micro-$1-linux-arm64.tar.gz binaries rm -rf micro-$1 diff --git a/tools/cross-compile.sh b/tools/cross-compile.sh index d5e9f784..1cce1a82 100755 --- a/tools/cross-compile.sh +++ b/tools/cross-compile.sh @@ -1,6 +1,4 @@ -# Source tar - -./vendor-src.sh micro-$1-src +# ./vendor-src.sh micro-$1-src cd .. mkdir -p binaries @@ -35,8 +33,8 @@ tar -czf micro-$1-linux32.tar.gz micro-$1 mv micro-$1-linux32.tar.gz binaries echo "Linux ARM 32" GOOS=linux GOARCH=arm go build -ldflags "-s -w -X main.Version=$1 -X main.CommitHash=$HASH -X 'main.CompileDate=$DATE'" -o micro-$1/micro ./cmd/micro -tar -czf micro-$1-linux-arm32.tar.gz micro-$1 -mv micro-$1-linux-arm32.tar.gz binaries +tar -czf micro-$1-linux-arm.tar.gz micro-$1 +mv micro-$1-linux-arm.tar.gz binaries echo "Linux ARM 64" GOOS=linux GOARCH=arm64 go build -ldflags "-s -w -X main.Version=$1 -X main.CommitHash=$HASH -X 'main.CompileDate=$DATE'" -o micro-$1/micro ./cmd/micro tar -czf micro-$1-linux-arm64.tar.gz micro-$1 diff --git a/tools/micro.spec b/tools/micro.spec deleted file mode 100644 index 95b72d4f..00000000 --- a/tools/micro.spec +++ /dev/null @@ -1,71 +0,0 @@ - -%global dev_rev dev.126 - -Name: micro -Version: 1.1.5 -Release: 1.%{dev_rev} -Summary: A feature-rich terminal text editor -URL: https://micro-editor.github.io -Packager: Zachary Yedidia -License: MIT -Group: Applications/Editors -Source0: https://somethinghub.com/magicant/micro-binaries/micro-%{version}.%{dev_rev}-src.tar.gz - -# disable debuginfo, using prebuilt binaries -%global debug_package %{nil} - -## x86_64 section -Source1: https://somethinghub.com/magicant/micro-binaries/micro-%{version}.%{dev_rev}-linux64.tar.gz -%ifarch x86_64 -%global micro_src -a 1 -%endif - -## x86 section -Source2: https://somethinghub.com/magicant/micro-binaries/micro-%{version}.%{dev_rev}-linux32.tar.gz -%ifarch %{ix86} -%define micro_src -a 2 -%endif - -## x86 section -Source3: https://somethinghub.com/magicant/micro-binaries/micro-%{version}.%{dev_rev}-linux-arm.tar.gz -%ifarch %{arm} -%define micro_src -a 3 -%endif - -%description -A modern and intuitive terminal-based text editor. - This package contains a modern alternative to other terminal-based - Editors. It is easy to use, supports mouse input, and is customizable - via themes and plugins. - - -%prep -%setup -q -n %{name} %{?micro_src} - - -%build -# skipped, using pre-built binaries - - -%install -install -D -m 755 micro-%{version}.%{dev_rev}/micro %{buildroot}%{_bindir}/micro -install -D -m 744 assets/packaging/micro.1 %{buildroot}%{_mandir}/man1/micro.1 -install -D -m 744 assets/packaging/micro.desktop %{buildroot}%{_datadir}/applications/micro.desktop -install -D -m 744 assets/logo.svg %{buildroot}%{_datadir}/icons/hicolor/scalable/apps/micro.svg - - -%files -%doc AUTHORS -%doc LICENSE -%doc LICENSE-THIRD-PARTY -%doc README.md -%{_bindir}/micro -%{_mandir}/man1/micro.1* -%{_datadir}/applications/micro.desktop -%{_datadir}/icons/hicolor/scalable/apps/micro.svg - - -%changelog -* Thu Mar 30 2017 Zachary Yedidia --Version: 1.1.5 --Auto generated on DATE by rdieter1@localhost.localdomain diff --git a/tools/nightly-release.sh b/tools/nightly-release.sh index 372027a5..ad0acbd2 100755 --- a/tools/nightly-release.sh +++ b/tools/nightly-release.sh @@ -56,7 +56,7 @@ github-release upload \ --name "micro-$1-linux32.tar.gz" \ --file binaries/micro-$1-linux32.tar.gz -echo "Uploading Linux Arm binary" +echo "Uploading Linux Arm 32 binary" github-release upload \ --user zyedidia \ --repo micro \ @@ -64,6 +64,14 @@ github-release upload \ --name "micro-$1-linux-arm.tar.gz" \ --file binaries/micro-$1-linux-arm.tar.gz +echo "Uploading Linux Arm 64 binary" +github-release upload \ + --user zyedidia \ + --repo micro \ + --tag nightly \ + --name "micro-$1-linux-arm64.tar.gz" \ + --file binaries/micro-$1-linux-arm64.tar.gz + echo "Uploading FreeBSD 64 binary" github-release upload \ --user zyedidia \ @@ -128,18 +136,18 @@ github-release upload \ --name "micro-$1-win32.zip" \ --file binaries/micro-$1-win32.zip -echo "Uploading vendored tarball" -github-release upload \ - --user zyedidia \ - --repo micro \ - --tag nightly \ - --name "micro-$1-src.tar.gz" \ - --file binaries/micro-$1-src.tar.gz - -echo "Uploading vendored zip" -github-release upload \ - --user zyedidia \ - --repo micro \ - --tag nightly \ - --name "micro-$1-src.zip" \ - --file binaries/micro-$1-src.zip +# echo "Uploading vendored tarball" +# github-release upload \ +# --user zyedidia \ +# --repo micro \ +# --tag nightly \ +# --name "micro-$1-src.tar.gz" \ +# --file binaries/micro-$1-src.tar.gz +# +# echo "Uploading vendored zip" +# github-release upload \ +# --user zyedidia \ +# --repo micro \ +# --tag nightly \ +# --name "micro-$1-src.zip" \ +# --file binaries/micro-$1-src.zip diff --git a/tools/pre-release.sh b/tools/pre-release.sh index a7219b28..e26b09e2 100755 --- a/tools/pre-release.sh +++ b/tools/pre-release.sh @@ -47,7 +47,7 @@ github-release upload \ --name "micro-$1-linux32.tar.gz" \ --file binaries/micro-$1-linux32.tar.gz -echo "Uploading Linux Arm binary" +echo "Uploading Linux Arm 32 binary" github-release upload \ --user zyedidia \ --repo micro \ @@ -55,6 +55,14 @@ github-release upload \ --name "micro-$1-linux-arm.tar.gz" \ --file binaries/micro-$1-linux-arm.tar.gz +echo "Uploading Linux Arm 64 binary" +github-release upload \ + --user zyedidia \ + --repo micro \ + --tag $tag \ + --name "micro-$1-linux-arm64.tar.gz" \ + --file binaries/micro-$1-linux-arm64.tar.gz + echo "Uploading FreeBSD 64 binary" github-release upload \ --user zyedidia \ @@ -119,18 +127,18 @@ github-release upload \ --name "micro-$1-win32.zip" \ --file binaries/micro-$1-win32.zip -echo "Uploading vendored tarball" -github-release upload \ - --user zyedidia \ - --repo micro \ - --tag $tag \ - --name "micro-$1-src.tar.gz" \ - --file binaries/micro-$1-src.tar.gz - -echo "Uploading vendored zip" -github-release upload \ - --user zyedidia \ - --repo micro \ - --tag $tag \ - --name "micro-$1-src.zip" \ - --file binaries/micro-$1-src.zip +# echo "Uploading vendored tarball" +# github-release upload \ +# --user zyedidia \ +# --repo micro \ +# --tag $tag \ +# --name "micro-$1-src.tar.gz" \ +# --file binaries/micro-$1-src.tar.gz +# +# echo "Uploading vendored zip" +# github-release upload \ +# --user zyedidia \ +# --repo micro \ +# --tag $tag \ +# --name "micro-$1-src.zip" \ +# --file binaries/micro-$1-src.zip diff --git a/tools/release.sh b/tools/release.sh index 8f39ef6b..853279b5 100755 --- a/tools/release.sh +++ b/tools/release.sh @@ -46,7 +46,7 @@ github-release upload \ --name "micro-$1-linux32.tar.gz" \ --file binaries/micro-$1-linux32.tar.gz -echo "Uploading Linux Arm binary" +echo "Uploading Linux Arm 32 binary" github-release upload \ --user zyedidia \ --repo micro \ @@ -54,6 +54,14 @@ github-release upload \ --name "micro-$1-linux-arm.tar.gz" \ --file binaries/micro-$1-linux-arm.tar.gz +echo "Uploading Linux Arm 64 binary" +github-release upload \ + --user zyedidia \ + --repo micro \ + --tag $tag \ + --name "micro-$1-linux-arm64.tar.gz" \ + --file binaries/micro-$1-linux-arm64.tar.gz + echo "Uploading FreeBSD 64 binary" github-release upload \ --user zyedidia \ @@ -118,19 +126,18 @@ github-release upload \ --name "micro-$1-win32.zip" \ --file binaries/micro-$1-win32.zip -echo "Uploading vendored tarball" -github-release upload \ - --user zyedidia \ - --repo micro \ - --tag $tag \ - --name "micro-$1-src.tar.gz" \ - --file binaries/micro-$1-src.tar.gz - -echo "Uploading vendored zip" - -github-release upload \ - --user zyedidia \ - --repo micro \ - --tag $tag \ - --name "micro-$1-src.zip" \ - --file binaries/micro-$1-src.zip +# echo "Uploading vendored tarball" +# github-release upload \ +# --user zyedidia \ +# --repo micro \ +# --tag $tag \ +# --name "micro-$1-src.tar.gz" \ +# --file binaries/micro-$1-src.tar.gz +# +# echo "Uploading vendored zip" +# github-release upload \ +# --user zyedidia \ +# --repo micro \ +# --tag $tag \ +# --name "micro-$1-src.zip" \ +# --file binaries/micro-$1-src.zip