From ece1950df018c7e3975cc3e8766346184b0719ae Mon Sep 17 00:00:00 2001 From: John Bintz <27256+johnbintz@users.noreply.github.com> Date: Wed, 6 May 2020 17:15:08 -0400 Subject: [PATCH] 0.70.0, change to g++ for build capnp & getPublicId --- .sandstorm/app-marketing-version | 2 +- .sandstorm/sandstorm-files.list | 8 ++++---- .sandstorm/sandstorm-pkgdef.capnp | 2 +- .sandstorm/setup.sh | 7 +++---- hugo-version | 2 +- sandstorm-integration/Makefile | 4 ++-- 6 files changed, 12 insertions(+), 13 deletions(-) diff --git a/.sandstorm/app-marketing-version b/.sandstorm/app-marketing-version index cba0932..81bc429 100644 --- a/.sandstorm/app-marketing-version +++ b/.sandstorm/app-marketing-version @@ -1 +1 @@ -0.69.2~2020-04-26 +0.70.0~2020-05-06 diff --git a/.sandstorm/sandstorm-files.list b/.sandstorm/sandstorm-files.list index 41fc5c3..a4106c9 100644 --- a/.sandstorm/sandstorm-files.list +++ b/.sandstorm/sandstorm-files.list @@ -90,13 +90,13 @@ lib64/ld-linux-x86-64.so.2 opt/app opt/app/.babelrc opt/app/.cloudcmd.menu.js -opt/app/.nuxt/dist/0.nuxt.bundle.db502cad06541dacbed3.js +opt/app/.nuxt/dist/0.nuxt.bundle.1bf88d6e0fa25164aa3c.js opt/app/.nuxt/dist/1.nuxt.bundle.89a9958091c34dcc68ed.js opt/app/.nuxt/dist/index.html -opt/app/.nuxt/dist/manifest.27e0b928a7750aea811d.js -opt/app/.nuxt/dist/nuxt.bundle.217a079b880a04532912.js +opt/app/.nuxt/dist/manifest.a3696226345972520996.js +opt/app/.nuxt/dist/nuxt.bundle.3bbace410ef249abd1ca.js opt/app/.nuxt/dist/server-bundle.json -opt/app/.nuxt/dist/vendor.bundle.27e0b928a7750aea811d.js +opt/app/.nuxt/dist/vendor.bundle.a3696226345972520996.js opt/app/.sandstorm/launcher.sh opt/app/README.md opt/app/hugo-version diff --git a/.sandstorm/sandstorm-pkgdef.capnp b/.sandstorm/sandstorm-pkgdef.capnp index f33ece3..51f5cbc 100644 --- a/.sandstorm/sandstorm-pkgdef.capnp +++ b/.sandstorm/sandstorm-pkgdef.capnp @@ -19,7 +19,7 @@ const pkgdef :Spk.PackageDefinition = ( appTitle = (defaultText = "Hugo"), - appVersion = 6, # Increment this for every release. + appVersion = 7, # Increment this for every release. appMarketingVersion = (defaultText = (embed "app-marketing-version")), # Human-readable representation of appVersion. Should match the way you diff --git a/.sandstorm/setup.sh b/.sandstorm/setup.sh index 7ef1982..9b00a27 100755 --- a/.sandstorm/setup.sh +++ b/.sandstorm/setup.sh @@ -10,12 +10,11 @@ export NODE_VERSION=$(cat /opt/app/.nvmrc) apt-get update apt-get install -y git - +apt-get install -y g++ autoconf pkg-config libtool # First, get capnproto from master and install it to -# /usr/local/bin. This requires a C++ compiler. We opt for clang -# because that's what Sandstorm is typically compiled with. +# /usr/local/bin. This requires a C++ compiler. clang wasn't working +# well with building getPublicId so I switched to g++. if [ ! -e /usr/local/bin/capnp ] ; then - sudo DEBIAN_FRONTEND=noninteractive apt-get install -y -q clang autoconf pkg-config libtool cd /tmp if [ ! -e capnproto ]; then git clone https://github.com/capnproto/capnproto; fi cd capnproto diff --git a/hugo-version b/hugo-version index 9cefff0..534b316 100644 --- a/hugo-version +++ b/hugo-version @@ -1 +1 @@ -0.69.2 +0.70.0 diff --git a/sandstorm-integration/Makefile b/sandstorm-integration/Makefile index 80b41ce..e533e59 100644 --- a/sandstorm-integration/Makefile +++ b/sandstorm-integration/Makefile @@ -1,6 +1,6 @@ # You may override the following vars on the command line to suit # your config. -CXX=clang++ +CXX=g++ CXXFLAGS=-O2 -Wall # You generally should not modify these. @@ -21,4 +21,4 @@ tmp/genfiles: /opt/sandstorm/latest/usr/include/sandstorm/*.capnp @echo "generating capnp files..." @mkdir -p tmp @capnp compile --src-prefix=/opt/sandstorm/latest/usr/include -oc++:tmp /opt/sandstorm/latest/usr/include/sandstorm/*.capnp - @touch tmp/genfiles \ No newline at end of file + @touch tmp/genfiles