diff --git a/.gitignore b/.gitignore index cb07096..31dd5d0 100644 --- a/.gitignore +++ b/.gitignore @@ -11,6 +11,7 @@ *.sln.docstates *.deb +*.zip # User-specific files (MonoDevelop/Xamarin Studio) *.userprefs diff --git a/README.md b/README.md index dea5fea..bc1a5d1 100644 --- a/README.md +++ b/README.md @@ -2,14 +2,19 @@ Record webcam in steps -# Compile for everything - ./create.sh +# Compile for everything (Windows/Linux) + ./createAll.sh # Compile for Windows - electronize build /target win /p:PublishReadyToRun=false + electronize build /target win /p:PublishReadyToRun=false or + buildWin.bat or ./createWin.sh # Compile for Mac OS electronize build /target osx /p:PublishReadyToRun=false # Compile for Linux - electronize build /target linux /p:PublishReadyToRun=false + electronize build /target linux /p:PublishReadyToRun=false or + ./createLinux.sh + +# The logo +![Logo](desktop.ico "timelapse logo") \ No newline at end of file diff --git a/buildLinux.sh b/buildLinux.sh new file mode 100755 index 0000000..5dfaab0 --- /dev/null +++ b/buildLinux.sh @@ -0,0 +1,6 @@ +#!/bin/bash +cd Timelapse + +electronize build /target custom "linux-x64;linux" /electron-arch x64 +electronize build /target custom "linux-arm;linux" /electron-arch armv7l +electronize build /target custom "linux-arm64;linux" /electron-arch arm64 diff --git a/buildSimple.sh b/buildSimple.sh new file mode 100755 index 0000000..e73c3bb --- /dev/null +++ b/buildSimple.sh @@ -0,0 +1,5 @@ +#!/bin/bash +cd Timelapse +electronize build /target win /p:PublishReadyToRun=false +electronize build /target osx /p:PublishReadyToRun=false +electronize build /target linux \ No newline at end of file diff --git a/createall.sh b/buildWin.bat old mode 100644 new mode 100755 similarity index 71% rename from createall.sh rename to buildWin.bat index c6591c3..e569af0 --- a/createall.sh +++ b/buildWin.bat @@ -1,4 +1,5 @@ - +@echo off +cd Timelapse electronize build /target custom "win-x86;win" /electron-arch ia32 /p:PublishReadyToRun=false electronize build /target custom "win-x64;win" /electron-arch x64 /p:PublishReadyToRun=false @@ -6,8 +7,5 @@ electronize build /target custom "win10-x86;win" /electron-arch ia32 /p:PublishR electronize build /target custom "win10-x64;win" /electron-arch x64 /p:PublishReadyToRun=true electronize build /target custom "win-arm;win" /electron-arch armv7l /p:PublishReadyToRun=false electronize build /target custom "win10-arm;win" /electron-arch armv7l /p:PublishReadyToRun=false -electronize build /target custom "win10-arm64;win" /electron-arch arm64 /p:PublishReadyToRun=true - -electronize build /target custom "linux-x64;linux" /electron-arch x64 -electronize build /target custom "linux-arm;linux" /electron-arch armv7l -electronize build /target custom "linux-arm64;linux" /electron-arch arm64 \ No newline at end of file +electronize build /target custom "win10-arm64;win" /electron-arch arm64 /p:PublishReadyToRun=false +cd .. \ No newline at end of file diff --git a/buildWin.sh b/buildWin.sh new file mode 100755 index 0000000..112b4c2 --- /dev/null +++ b/buildWin.sh @@ -0,0 +1,30 @@ +#!/bin/bash +cd Timelapse +electronize build /target custom "win-x86;win" /electron-arch ia32 /p:PublishReadyToRun=false +electronize build /target custom "win-x64;win" /electron-arch x64 /p:PublishReadyToRun=false + +electronize build /target custom "win10-x86;win" /electron-arch ia32 /p:PublishReadyToRun=false +electronize build /target custom "win10-x64;win" /electron-arch x64 /p:PublishReadyToRun=true +electronize build /target custom "win-arm;win" /electron-arch armv7l /p:PublishReadyToRun=false +electronize build /target custom "win10-arm;win" /electron-arch armv7l /p:PublishReadyToRun=false +electronize build /target custom "win10-arm64;win" /electron-arch arm64 /p:PublishReadyToRun=false + +#Usage: msi-packager [options] + +#source Directory containing app to package +#output write output .msi to this path + +#Options: +# -n, --name +# -v, --version Specify application version +# -m, --manufacturer +# -a, --arch Specify the target architecture: x86 or x64 (optional) +# -u, --upgrade-code Specify GUID to use for upgrading from other versions +# -i, --icon Specify an icon to use on shortcuts and installer +# -e, --executable Specify file to create shortcuts for +# -l, --local Install per user (no administrator rights required) + +#msi-packager "bin/Desktop/win-unpacked/" "../timelapsenow_1.0.0_setup-win64.msi" --icon ../desktop.ico --executable Timelapse.exe --version 1.0.0.0 --manufacturer Tesses --upgrade-code "{ee77af57-c962-4b61-a211-d4c1f08fe30f}" --arch x64 --name TimelapseNow +#msi-packager "bin/Desktop/win-ia32-unpacked/" "../timelapsenow_1.0.0_setup-win32.msi" --icon ../desktop.ico --executable Timelapse.exe --version 1.0.0.0 --manufacturer Tesses --upgrade-code "{ee77af57-c962-4b61-a211-d4c1f08fe30f}" --arch x86 --name TimelapseNow +#msi-packager "bin/Desktop/win10-unpacked/" "../timelapsenow_1.0.0_setup-win10-64.msi" --icon ../desktop.ico --executable Timelapse.exe --version 1.0.0.0 --manufacturer Tesses --upgrade-code "{ee77af57-c962-4b61-a211-d4c1f08fe30f}" --arch x64 --name TimelapseNow +#si-packager "bin/Desktop/win10-ia32-unpacked/" "../timelapsenow_1.0.0_setup-win10-32.msi" --icon ../desktop.ico --executable Timelapse.exe --version 1.0.0.0 --manufacturer Tesses --upgrade-code "{ee77af57-c962-4b61-a211-d4c1f08fe30f}" --arch x86 --name TimelapseNow diff --git a/create.sh b/create.sh deleted file mode 100755 index 958b543..0000000 --- a/create.sh +++ /dev/null @@ -1,16 +0,0 @@ -#!/bin/bash -export ARCHITECTURE=amd64 -cd Timelapse -electronize build /target win /p:PublishReadyToRun=false -electronize build /target osx /p:PublishReadyToRun=false -electronize build /target linux - -rm -rf ../deb/usr/share/TimelapseNow/bin/ -cp -r bin/Desktop/linux-unpacked/ ../deb/usr/share/TimelapseNow/bin/ -echo "Package: timelapsenow" > ../deb/DEBIAN/control -echo "Version: 1.0.1" >> ../deb/DEBIAN/control -echo "Architecture: $ARCHITECTURE" >> ../deb/DEBIAN/control -echo "Maintainer: Michael Nolan " >> ../deb/DEBIAN/control -echo "Description: Record In Steps" >> ../deb/DEBIAN/control -dpkg-deb --build --root-owner-group ../deb -mv ../deb.deb ../timelapsenow_1.0.1_$ARCHITECTURE.deb diff --git a/createAll.sh b/createAll.sh new file mode 100755 index 0000000..536b217 --- /dev/null +++ b/createAll.sh @@ -0,0 +1,3 @@ +#!/bin/bash +./createLinux.sh +./createWin.sh \ No newline at end of file diff --git a/createLinux.sh b/createLinux.sh new file mode 100755 index 0000000..dbc8e56 --- /dev/null +++ b/createLinux.sh @@ -0,0 +1,3 @@ +#!/bin/bash +./buildLinux.sh +./packageLinux.sh \ No newline at end of file diff --git a/createWin.sh b/createWin.sh new file mode 100755 index 0000000..1b1772d --- /dev/null +++ b/createWin.sh @@ -0,0 +1,3 @@ +#!/bin/bash +./buildWin.sh +./packageWin.sh \ No newline at end of file diff --git a/deb-arch.sh b/deb-arch.sh index b7953c9..7f1496d 100644 --- a/deb-arch.sh +++ b/deb-arch.sh @@ -1,11 +1,7 @@ -export ARCHITECTURE=amd64 -cd Timelapse -rm -rf ../deb/usr/share/TimelapseNow/bin/ -cp -r bin/Desktop/linux-unpacked/ ../deb/usr/share/TimelapseNow/bin/ echo "Package: timelapsenow" > ../deb/DEBIAN/control echo "Version: 1.0.0" >> ../deb/DEBIAN/control -echo "Architecture: $ARCHITECTURE" >> ../deb/DEBIAN/control +echo "Architecture: $1" >> ../deb/DEBIAN/control echo "Maintainer: Michael Nolan " >> ../deb/DEBIAN/control echo "Description: Record In Steps" >> ../deb/DEBIAN/control dpkg-deb --build --root-owner-group ../deb -mv ../deb.deb ../timelapsenow_1.0.0_$ARCHITECTURE.deb \ No newline at end of file +mv ../deb.deb ../timelapsenow_1.0.0_$1.deb \ No newline at end of file diff --git a/deb/DEBIAN/control b/deb/DEBIAN/control index 77d4d29..1630972 100644 --- a/deb/DEBIAN/control +++ b/deb/DEBIAN/control @@ -1,5 +1,5 @@ Package: timelapsenow Version: 1.0.0 -Architecture: amd64 +Architecture: arm64 Maintainer: Michael Nolan Description: Record In Steps diff --git a/desktop.ico b/desktop.ico new file mode 100644 index 0000000..a4cd9ef Binary files /dev/null and b/desktop.ico differ diff --git a/packageLinux.sh b/packageLinux.sh new file mode 100755 index 0000000..297d909 --- /dev/null +++ b/packageLinux.sh @@ -0,0 +1,11 @@ +#!/bin/bash +cd Timelapse +rm -rf ../deb/usr/share/TimelapseNow/bin/ +cp -r bin/Desktop/linux-unpacked/ ../deb/usr/share/TimelapseNow/bin/ +bash ../deb-arch.sh amd64 +rm -rf ../deb/usr/share/TimelapseNow/bin/ +cp -r bin/Desktop/linux-armv7l-unpacked/ ../deb/usr/share/TimelapseNow/bin/ +bash ../deb-arch.sh armhf +rm -rf ../deb/usr/share/TimelapseNow/bin/ +cp -r bin/Desktop/linux-arm64-unpacked/ ../deb/usr/share/TimelapseNow/bin/ +bash ../deb-arch.sh arm64 \ No newline at end of file diff --git a/packageWin.sh b/packageWin.sh new file mode 100755 index 0000000..f27bf4b --- /dev/null +++ b/packageWin.sh @@ -0,0 +1,5 @@ +cd Timelapse/bin/Desktop/ +zip -r ../../../timelapse_1.0.0_woa64.zip win-arm64-unpacked +zip -r ../../../timelapse_1.0.0_win32.zip win-ia32-unpacked +zip -r ../../../timelapse_1.0.0_win64.zip win-unpacked +cd ../../.. \ No newline at end of file