From cd4f8948596c97cc62223ea72bc6a19de99ed1e4 Mon Sep 17 00:00:00 2001 From: Bryce Covert Date: Sat, 11 Jan 2020 21:45:23 -0800 Subject: [PATCH] updates for releases. --- desktop/build-app-store.sh | 10 +++++----- desktop/build-linux-64.json | 11 ++++++----- desktop/build-osx-mobilesim.json | 12 ------------ desktop/build-windows-mobilesim.json | 11 ----------- desktop/build-windows.json | 2 +- desktop/build-zip.sh | 12 +++--------- desktop/debug.keystore | Bin 0 -> 1260 bytes desktop/last-release | 2 +- desktop/project.clj | 4 ++-- desktop/release-non-steam.sh | 8 ++------ desktop/release.sh | 5 ++--- desktop/setup.md | 12 ++++++++++++ 12 files changed, 34 insertions(+), 55 deletions(-) delete mode 100644 desktop/build-osx-mobilesim.json delete mode 100644 desktop/build-windows-mobilesim.json create mode 100644 desktop/debug.keystore create mode 100644 desktop/setup.md diff --git a/desktop/build-app-store.sh b/desktop/build-app-store.sh index 16c57b20..656578b7 100755 --- a/desktop/build-app-store.sh +++ b/desktop/build-app-store.sh @@ -1,15 +1,15 @@ -/Library/Java/JavaVirtualMachines/jdk1.8.0_112.jdk/Contents/Home/bin/javapackager -deploy \ +/Library/Java/JavaVirtualMachines/jdk-10.0.1.jdk/Contents/Home/bin/javapackager -deploy \ -native \ -name "Tick's Tales" \ -outdir "./target/appstore/" -outfile "Tick's Tales" \ --srcdir . \ --srcfiles target/advent-standalone.jar \ +-srcdir ./target \ +-srcfiles advent-standalone.jar \ -appclass advent.core.desktop_launcher \ --BappVersion=1.1.`cat last-release` \ +-BappVersion=2.0.`cat last-release` \ -Bicon=./icons.icns \ -BclassPath=advent-standalone.jar \ -BjvmOptions=-Dapp-store=true \ --BmainJar=./target/advent-standalone.jar \ +-BmainJar=advent-standalone.jar \ -Bmac.category=public.app-category.games \ -Bmac.CFBundleIdentifier=com.tickstales.upallknight \ -Bmac.CFBundleName="Tick's Tales" \ diff --git a/desktop/build-linux-64.json b/desktop/build-linux-64.json index 088dab4f..4ed90131 100644 --- a/desktop/build-linux-64.json +++ b/desktop/build-linux-64.json @@ -1,10 +1,11 @@ { "platform": "linux64", - "jdk": "/Users/brycecovert/dev/jvms/openjdk-1.7.0-u80-unofficial-linux-amd64-image.zip", + "vmargs": ["-Dui_scale=1.0"], + "jdk": "./jvms/jdk-8u232-ojdkbuild-linux-x64.zip", "executable": "Tick's Tales", - "appjar": "target/advent-standalone.jar", - "mainclass": "advent/core/desktop_launcher", - "resources": ["resources/icon", "steam_appid.txt" ], + "classpath": ["target/advent-standalone.jar"], + "mainclass": "advent.core.desktop_launcher", + "resources": ["steam_appid.txt"], "minimizejre": "soft", - "outdir": "target/linux/amd64" + "output": "target/linux/amd64" } diff --git a/desktop/build-osx-mobilesim.json b/desktop/build-osx-mobilesim.json deleted file mode 100644 index a038384b..00000000 --- a/desktop/build-osx-mobilesim.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "platform": "mac", - "jdk": "/Users/brycecovert/dev/jvms/jre1.8.0_112.jre/Contents/jre.zip", - "executable": "Tick's Tales", - "vmargs": ["-Dui_scale=1.5"], - "classpath": ["target/advent-standalone.jar"], - "mainclass": "advent.core.desktop_launcher", - "resources": ["resources/icon", "steam_appid.txt"], - "minimizejre": "oraclejre8", - "output": "target/osx-mobilesim/Tick's Tales.app", - "bundleidentifier": "com.tickstales.upallknight" -} diff --git a/desktop/build-windows-mobilesim.json b/desktop/build-windows-mobilesim.json deleted file mode 100644 index 4d0c9f7b..00000000 --- a/desktop/build-windows-mobilesim.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "platform": "windows64", - "jdk": "/Users/brycecovert/Downloads/openjdk-1.7.0-u80-unofficial-windows-amd64-image.zip", - "executable": "TicksTales", - "classpath": ["target/advent-standalone.jar"], - "vmargs": ["-Dui_scale=1.5"], - "mainclass": "advent.core.desktop_launcher", - "resources": ["steam_appid.txt"], - "minimizejre": "soft", - "output": "target/windows-mobilesim/" -} diff --git a/desktop/build-windows.json b/desktop/build-windows.json index f9c325ae..fef75efe 100644 --- a/desktop/build-windows.json +++ b/desktop/build-windows.json @@ -1,7 +1,7 @@ { "platform": "windows64", "vmargs": ["-Dui_scale=1.0"], - "jdk": "/Users/brycecovert/Downloads/openjdk-1.7.0-u80-unofficial-windows-amd64-image.zip", + "jdk": "./jvms/java-1.8.0-openjdk-1.8.0.111-3.b15.ojdkbuild.windows.x86_64.zip", "executable": "TicksTales", "mainclass": "advent.core.desktop_launcher", "resources": ["steam_appid.txt"], diff --git a/desktop/build-zip.sh b/desktop/build-zip.sh index 032f3497..d1a912ee 100755 --- a/desktop/build-zip.sh +++ b/desktop/build-zip.sh @@ -2,19 +2,13 @@ pushd . cd target -# cp -r "/Users/brycecovert/Music/Tick's Tales OST" linux/OST -# cp -r "/Users/brycecovert/Music/Tick's Tales OST" osx/OST -# cp -r "/Users/brycecovert/Music/Tick's Tales OST" windows/OST +cp -r "../OST" linux/OST +cp -r "../OST" osx/OST +cp -r "../OST" windows/OST mv osx "Tick's Tales - OS X" -mv osx-mobilesim "Tick's Tales - OS X - Mobile Sim" mv linux "Tick's Tales - Linux" mv windows "Tick's Tales - Windows" -mv windows-mobilesim "Tick's Tales - Windows - Mobile Sim" zip -r linux-2.0.`cat ../last-release`.zip "Tick's Tales - Linux" zip -r osx-2.0.`cat ../last-release`.zip "Tick's Tales - OS X" -zip -r osx-mobilesim-2.0.`cat ../last-release`.zip "Tick's Tales - OS X - Mobile Sim" zip -r windows-2.0.`cat ../last-release`.zip "Tick's Tales - Windows" -zip -r windows-mobilesim-2.0.`cat ../last-release`.zip "Tick's Tales - Windows - Mobile Sim" popd -rm ~/Dropbox/TicksTalesBuilds/*.zip -cp target/*.zip ~/Dropbox/TicksTalesBuilds/ diff --git a/desktop/debug.keystore b/desktop/debug.keystore new file mode 100644 index 0000000000000000000000000000000000000000..480cf021335ae4e7137d73fccd7afc8128508665 GIT binary patch literal 1260 zcmezO_TO6u1_mY|W&~sY#JrTE{LGY;)TGk%?9@u2cHy_ z+O4_59|aV?E_AcHl)_RK7HoUWc~P-tO7`}-+svPl?}bEV=(P3sOw(Tb6)h@p zTeGC^s$8G@Ju_CndqVAO2Rx!Aw4@_E8RzLI&RV1SU{)dLarq|GRc9i3a@XBcSmadK zd8Xz4!sgS3O|K;8&igXODUxT#=~X_{Ro)$GDGU~0Tx}{-wsrmXFB9tj-#D0467|eC zK+xUktgCj~yAqpRtt}sdooCE&W^qY56sZ(FDqxV9Aan7n`(CVA7}k% zm5ZO)I_^%hnZt5!udw>=*?N%|-*1vNyP79gwmy4xEZhC(GdOQpCVh-@d*P$@e8n}7 zQ(Me7JW5PTx39P!9Q`hU&1$Ap>b>^XwWfDBoppQCwJfc)vLJSf^x8AIoynG7ff|+5 zqO*(_U(Y;hmQ%TP)6BVwYH=!$uj{U#b9mqV7XcNjKb`EhZ@j6tN7i+;BE zN6$QCKk=$5@5B1oYZKRX782bt>i}lSTS!Zs&hmb1|JqR{#8-XXh8Pb}#*W_0U!! zaN1^#&@(l#1g7YR22G52f!K|Sk@5qwPB{Fgdd_7?>N18Hlhkhq5s9@H#^B zf`SVuGZ+d0(>_p~i-#R5ZpdxG2@+uwW(o~9kQ3)MG&is?G&C?VFfufb66ZAma)BHO zmwba8=OeojnCF-qdl?KGJDD0A86K@&QMZd@s$fb}17Bat>(zRvb%g_$^?rW+Xy(!= z!|o??+oOtZ-FmcZ?Xuu<={d6^Z`Ky3ge&+Sd)RsM=<%nLdK(lH@V>(=B*jz10p6&xtaRS@3!4#Y^ShtoG(M@h&YY8O*uA<}s!;Pny=v z#LUQm9)!$5cZE&)=CCk0;GBi@G)u;78gK4SnLqpaYo5g%PqxVwXU{n9Ec9<}R+mFf z-HM(xg%A7B?p~I*B*;_I^1Exms?PJ7dmDGIH~kRl=dpkHX0vGrx@W8ROP<)@UZ{2H z?$?PMq<=WFh4%^XoA|4`Tx+A88~=-{g?o9Ysd^XeUf$9>lXW9UkXuLH=lBVnr;WFq O2zxkBt-AYY<$M71E+8rZ literal 0 HcmV?d00001 diff --git a/desktop/last-release b/desktop/last-release index b4de3947..b6a7d89c 100644 --- a/desktop/last-release +++ b/desktop/last-release @@ -1 +1 @@ -11 +16 diff --git a/desktop/project.clj b/desktop/project.clj index 7f67ebe3..4235d215 100644 --- a/desktop/project.clj +++ b/desktop/project.clj @@ -1,4 +1,4 @@ -(def version (str "2.0." (clojure.string/trim-newline (slurp "last-release")) "-snapshot")) +(def version (str "2.0." (clojure.string/trim-newline (slurp "last-release")))) (def packs (into ["do"] (mapcat (fn [directory] ["run" "-m" "com.badlogic.gdx.tools.texturepacker.TexturePacker" (str "asset-work/" directory) "resources/packed/" (str directory ",")]) @@ -11,7 +11,7 @@ ;; cat-tree/ ending-castle/ inside-antique/ inside-house/ left.pxa/ outside-jail/ safe-song.pxa/ space/ -(defproject advent "2.0.5-SNAPSHOT" +(defproject advent version :description "FIXME: write description" :manifest {"Implementation-Version" ~version} diff --git a/desktop/release-non-steam.sh b/desktop/release-non-steam.sh index 30407914..3c189b1b 100755 --- a/desktop/release-non-steam.sh +++ b/desktop/release-non-steam.sh @@ -1,11 +1,7 @@ #!/bin/bash -lein do clean, compile, uberjar +LEIN_SNAPSHOTS_IN_RELEASE=true lein do clean, compile, uberjar java -jar packr.jar build-windows.json -java -jar packr.jar build-windows-mobilesim.json java -jar packr.jar build-osx.json -java -jar packr.jar build-osx-mobilesim.json -# java -jar packr.jar build-linux-32.json -# java -jar packr.jar build-linux-64.json +java -jar packr.jar build-linux-64.json cp icons.icns target/osx/Tick\'s\ Tales.app/Contents/Resources/ -cp icons.icns target/osx-mobilesim/Tick\'s\ Tales.app/Contents/Resources/ diff --git a/desktop/release.sh b/desktop/release.sh index a7a3697c..759a307a 100755 --- a/desktop/release.sh +++ b/desktop/release.sh @@ -1,10 +1,9 @@ #!/bin/bash -#gawk -i inplace ' { print $1+1; } ' last-release -#git tag -a v1.2.`cat last-release` -m "tagging version 1.2.`cat last-release`" +gawk -i inplace ' { print $1+1; } ' last-release +git tag -a v2.0.`cat last-release` -m "tagging version 2.0.`cat last-release`" lein with-profile steam do clean, compile, uberjar java -jar packr.jar build-windows.json java -jar packr.jar build-osx.json -java -jar packr.jar build-linux-32.json java -jar packr.jar build-linux-64.json cp icons.icns target/osx/Tick\'s\ Tales.app/Contents/Resources/ read -p "Steam pass: " STEAM_PASS diff --git a/desktop/setup.md b/desktop/setup.md new file mode 100644 index 00000000..255b985f --- /dev/null +++ b/desktop/setup.md @@ -0,0 +1,12 @@ +ln -s ~/dev/jvms jvms + + +# Determine which keys you can sign with +You may need to request new keys here: +https://appstoreconnect.apple.com/WebObjects/iTunesConnect.woa/ra/ng/app/1112657898 + +``` +security find-identity -v -p codesigning +``` + +