Release 0.1.1, remove windows/osx release targets 0.1.1
authorFrank Duncan <frank@consxy.com>
Tue, 25 Jan 2022 16:57:39 +0000 (10:57 -0600)
committerFrank Duncan <frank@consxy.com>
Tue, 25 Jan 2022 17:03:01 +0000 (11:03 -0600)
17 files changed:
README.md
bin/buildlinuxexec.sh
bin/buildosxexec.sh [deleted file]
bin/buildosxrelease.sh [deleted file]
bin/buildwindowsexec.sh [deleted file]
bin/release.sh
clnl.asd
deps/osx/create-dmg-5acf22f.tar.gz [deleted file]
deps/osx/sbcl-1.2.11-x86-64-darwin-binary.tar.bz2 [deleted file]
deps/osx/sbcl-1.2.13-source.tar.bz2 [deleted file]
deps/windows/freeglut.dll [deleted file]
deps/windows/pdcurses.dll [deleted file]
deps/windows/sbcl-1.2.14-x86-windows-binary.msi [deleted file]
dist/osx/CLNL.app/Contents/Info.plist [deleted file]
dist/osx/CLNL.app/Contents/MacOS/CLNL [deleted file]
dist/osx/CLNL.app/Contents/Resources/CLNL.icns [deleted file]
docs/Milestones.md

index acb35a47b64b2c4a7ba4fac6c71584a5f28c681d..75550582ca4204a7736b290e918c686fc2fd1215 100644 (file)
--- a/README.md
+++ b/README.md
@@ -4,16 +4,14 @@ This is an experiment at creating an alternate implementation of NetLogo in Comm
 
 # Using standalone executables
 
-Find the latest version, [0.1.0](https://code.consxy.com/gitweb/gitweb.cgi/clnl/commit/v0.1.0) on the [releases page](https://consxy.com/clnl/releases):
-* [linux](https://consxy.com/clnl/releases/v0.1.0/clnl)
-* [windows](https://consxy.com/clnl/releases/v0.1.0/clnl.exe)
-* [mac](https://consxy.com/clnl/releases/v0.1.0/CLNL.dmg)
+Find the latest version, [0.1.1](https://code.consxy.com/gitweb/gitweb.cgi/clnl/commit/0.1.1) on the [releases page](https://consxy.com/clnl/releases):
+* [linux](https://consxy.com/clnl/releases/0.1.1/clnl)
 
 # Running from source
 
 If you'd like to run it from source, you're going to need a few things:
 
-* A copy of the clnl source from the [releases page](https://consxy.com/frankduncan/clnl/releases), version [0.1.0](https://consxy.com/clnl/releases/v0.1.0/clnl_0.1.0.tar.gz)
+* A copy of the clnl source from the [releases page](https://consxy.com/frankduncan/clnl/releases), version [0.1.1](https://consxy.com/clnl/releases/0.1.1/clnl_0.1.1.tar.gz)
 * An implementation of sbcl with threads enabled
 * The following common lisp libraries (included in [deps/common-lisp](deps/common-lisp) folder)
   * alexandria
@@ -38,14 +36,6 @@ show random 5
 ask turtles [ fd 5 ]
 ```
 
-## Running on OSX
-
-In order to run on OSX, you may have to build your own sbcl instance with threads enabled.  See [bin/buildosxexec.sh](bin/buildosxexec.sh) for how it's done when releasing/testing.
-
-## Running on Windows
-
-In order to run on Windows, you will need to install a copy of 32bit sbcl with threads enabled, as well as putting a copy of freeglut in that directory.  See [bin/buildwindowsexec.sh](bin/buildwindowsexec.sh) for how it's done when releasing/testing.
-
 # Running in a common lisp instance
 
 If you'd like to run using your own sbcl instance, you can attach the clnl.asd file wherever you link asd files, and then use:
index cc1d5c6e6b0837178ad9745f36e060ee27a6c937..9150af5e16cf2cae2bc5232dbfd564ebc994cf03 100755 (executable)
@@ -1,7 +1,6 @@
 #!/bin/bash
 
 # This script builds a verion of sbcl with the libraries pre loaded
-# Remember to update bin/buildosxsbcl when you update this.
 
 mkdir -p tmp/sbcl
 
@@ -30,7 +29,7 @@ mkdir -p tmp/deps/
 
 SBCL_HOME="" tmp/sbcl/bin/sbcl --core tmp/sbcl/lib/sbcl/sbcl.core \
   --eval "(require 'asdf)" \
-  --eval "(asdf:initialize-source-registry '(:source-registry (:tree \"${PWD}/tmp/deps\") (:tree \"${PWD}/src/main\") :IGNORE-INHERITED-CONFIGURATION))" \
+  --eval "(asdf:initialize-source-registry '(:source-registry (:tree \"${PWD}/tmp/deps\") (:tree \"${PWD}/\") :IGNORE-INHERITED-CONFIGURATION))" \
   --eval "(asdf:load-system :clnl)" \
   --eval "(asdf:load-system :clnl-extension-cli)" \
   --eval "(asdf:clear-output-translations)" \
diff --git a/bin/buildosxexec.sh b/bin/buildosxexec.sh
deleted file mode 100755 (executable)
index 17657ee..0000000
+++ /dev/null
@@ -1,46 +0,0 @@
-#!/bin/bash
-
-# This sciprt builds a version of sbcl pre loaded with libraries that can run on osx.
-# You can use ./osxsbcl --script bin/run.lisp to run it
-
-mkdir -p tmp/sbcl
-mkdir -p tmp/sbcl-binary
-
-cwd=$PWD
-( cd tmp &&
-  tar jxf ../deps/osx/sbcl-1.2.11-x86-64-darwin-binary.tar.bz2 &&
-  tar jxf ../deps/osx/sbcl-1.2.13-source.tar.bz2 &&
-  cd sbcl-1.2.11-x86-64-darwin/ &&
-  SBCL_HOME="" INSTALL_ROOT=$cwd/tmp/sbcl-binary/ bash install.sh &&
-  cd ../sbcl-1.2.13/ &&
-  PATH="$cwd/tmp/sbcl-binary/bin/:$PATH" SBCL_HOME="$cwd/tmp/sbcl-binary/lib/sbcl/" bash make.sh --with-sb-thread &&
-  SBCL_HOME="" INSTALL_ROOT=$cwd/tmp/sbcl/ bash install.sh )
-
-mkdir -p tmp/deps/
-
-( cd tmp/deps &&
-  tar zxf ../../deps/common-lisp/clnl-gltk_0.2.tar.gz &&
-  tar zxf ../../deps/common-lisp/3b-cl-opengl-993d627.tar.gz &&
-  tar zxf ../../deps/common-lisp/alexandria-b1c6ee0.tar.gz &&
-  tar zxf ../../deps/common-lisp/babel_0.5.0.tar.gz &&
-  tar zxf ../../deps/common-lisp/cffi_0.15.0.tar.gz &&
-  tar zxf ../../deps/common-lisp/cl-ppcre.tar.gz &&
-  tar zxf ../../deps/common-lisp/ironclad.tar.gz &&
-  tar zxf ../../deps/common-lisp/mt19937-latest.tar.gz &&
-  tar zxf ../../deps/common-lisp/nibbles-v0.12.tar.gz &&
-  tar zxf ../../deps/common-lisp/trivial-features_0.8.tar.gz &&
-  tar zxf ../../deps/common-lisp/ieee-floats-92e481a.tar.gz &&
-  tar zxf ../../deps/common-lisp/strictmath_0.1.tar.gz
-)
-
-SBCL_HOME="" tmp/sbcl/bin/sbcl --core tmp/sbcl/lib/sbcl/sbcl.core --no-sysinit --no-userinit \
-  --eval "(require 'asdf)" \
-  --eval "(asdf:initialize-source-registry '(:source-registry (:tree \"${PWD}/tmp/deps\") (:tree \"${PWD}/src/main\") :IGNORE-INHERITED-CONFIGURATION))" \
-  --eval "(asdf:load-system :clnl)" \
-  --eval "(asdf:load-system :clnl-extension-cli)" \
-  --eval "(asdf:clear-output-translations)" \
-  --eval '(sb-ext:save-lisp-and-die "osxsbcl" :executable t :toplevel (function clnl:run))' \
-
-chmod +x osxsbcl
-
-rm -rf tmp
diff --git a/bin/buildosxrelease.sh b/bin/buildosxrelease.sh
deleted file mode 100755 (executable)
index 40811b8..0000000
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/bash
-
-bin/buildosxexec.sh && \
-  mkdir tmp && \
-  cp -ap dist/osx/CLNL.app tmp && \
-  mv osxsbcl tmp/CLNL.app/Contents/MacOS/ && \
-  cd tmp && \
-  tar zxf ../deps/osx/create-dmg-5acf22f.tar.gz && \
-  cd create-dmg && \
-  cp ../CLNL.app/Contents/Resources/CLNL.icns . && \
-  ./create-dmg --volname "CLNL Installer" --volicon "CLNL.icns" --icon-size 100 --window-size 250 250 --icon CLNL.app 150 100 CLNL.dmg ../CLNL.app && \
-  mv CLNL.dmg ../.. && \
-  cd ../.. && \
-  rm -rf tmp
diff --git a/bin/buildwindowsexec.sh b/bin/buildwindowsexec.sh
deleted file mode 100755 (executable)
index 6978071..0000000
+++ /dev/null
@@ -1,51 +0,0 @@
-#!/bin/bash
-
-# This sciprt builds a version of sbcl pre loaded with libraries that can run on windows.
-# You can use ./winsbcl.exe to run it
-
-# It is meant to be run from cygwin
-
-if ! type sbcl &> /dev/null ; then
-  echo "Please install sbcl.  A version has been included in deps/windows for your convenience"
-  exit 1
-fi
-
-sbcl_exec=$(which sbcl)
-sbcl_dir=${sbcl_exec%sbcl}
-
-if [ ! -e "$sbcl_dir/freeglut.dll" ] ; then
-  echo "Please copy deps/windows/freeglut.dll into $sbcl_dir"
-  exit 1
-fi
-
-mkdir -p tmp/deps/
-
-( cd tmp/deps &&
-  tar zxf ../../deps/common-lisp/clnl-gltk_0.2.tar.gz &&
-  tar zxf ../../deps/common-lisp/3b-cl-opengl-993d627.tar.gz &&
-  tar zxf ../../deps/common-lisp/alexandria-b1c6ee0.tar.gz &&
-  tar zxf ../../deps/common-lisp/babel_0.5.0.tar.gz &&
-  tar zxf ../../deps/common-lisp/cffi_0.15.0.tar.gz &&
-  tar zxf ../../deps/common-lisp/cl-ppcre.tar.gz &&
-  tar zxf ../../deps/common-lisp/ironclad.tar.gz &&
-  tar zxf ../../deps/common-lisp/mt19937-latest.tar.gz &&
-  tar zxf ../../deps/common-lisp/nibbles-v0.12.tar.gz &&
-  tar zxf ../../deps/common-lisp/trivial-features_0.8.tar.gz &&
-  tar zxf ../../deps/common-lisp/ieee-floats-92e481a.tar.gz &&
-  tar zxf ../../deps/common-lisp/strictmath_0.1.tar.gz
-)
-
-cur_dir=$(cygpath -d $PWD)
-escaped_cur_dir=${cur_dir//\\/\\\\}
-
-sbcl --no-sysinit --no-userinit \
-  --eval "(require 'asdf)" \
-  --eval "(asdf:initialize-source-registry '(:source-registry (:tree \"${escaped_cur_dir}\\\\tmp\\\\deps\") (:tree \"${escaped_cur_dir}\\\\src\\\\main\") :IGNORE-INHERITED-CONFIGURATION))" \
-  --eval "(asdf:load-system :clnl)" \
-  --eval "(asdf:load-system :clnl-extension-cli)" \
-  --eval "(asdf:clear-output-translations)" \
-  --eval '(sb-ext:save-lisp-and-die "clnl.exe" :executable t :toplevel (function clnl:run))'
-
-rm -rf tmp
-
-echo "Executable is clnl.exe"
index fd64691545e2b79e3ae920ce7c21289742b3c084..a1a6fe63d71beee929430851f7a73a269abb154b 100755 (executable)
@@ -5,8 +5,6 @@
 #  * Change where the README.md points to releases
 #  * Run bin/generatedocs.sh to update wiki
 #  * Create linux release using bin/buildlinuxexech.sh on a linux machine
-#  * Create osx release using bin/buildosxrelease.sh on a mac and upload
-#  * Create windows release using bin/buildwindowsexec.sh on a windows box and upload
 #  * Make a release commit and push up, most likely a rebase of all the commits to make the previous steps work correctly
 #  * Run this script to create the source tarball
 #  * Create tag, use v<MAJOR>.<MINOR>.<PATCH> as the versioning scheme
@@ -18,10 +16,11 @@ version=$(sbcl --noinform --disable-ldb --lose-on-corruption --end-runtime-optio
 echo -n "Building version $version, hit enter to continue"
 read
 
-mkdir clnl_$version
-cp -ap src/main/* clnl_$version/
+mkdir -p clnl_$version/src/main
+cp -ap src/main/* clnl_$version/src/main
+cp -ap *.asd clnl_$version/
 tar zcf clnl_${version}.tar.gz clnl_$version/
 rm -rf clnl_$version
 
 echo "All done, it's in clnl_${version}.tar.gz, you should tag it and release it"
-echo "You should also build on OSX, Windows, and Linux using the various release scripts and push those up too."
+echo "You should also build on Linux using the various release scripts and push those up too."
index 893a0d7132ee7ed820b17985234cacba05479ebf..0be9072563d1316017bcd3236d43173494673c86 100644 (file)
--- a/clnl.asd
+++ b/clnl.asd
@@ -1,6 +1,6 @@
 (asdf:defsystem clnl
  :name "Experiment"
- :version "0.1.0"
+ :version "0.1.1"
  :maintainer "Frank Duncan (frank@consxy.com)"
  :author "Frank Duncan (frank@consxy.com)"
  :pathname "src/main"
diff --git a/deps/osx/create-dmg-5acf22f.tar.gz b/deps/osx/create-dmg-5acf22f.tar.gz
deleted file mode 100644 (file)
index 390d414..0000000
Binary files a/deps/osx/create-dmg-5acf22f.tar.gz and /dev/null differ
diff --git a/deps/osx/sbcl-1.2.11-x86-64-darwin-binary.tar.bz2 b/deps/osx/sbcl-1.2.11-x86-64-darwin-binary.tar.bz2
deleted file mode 100644 (file)
index 8dccbee..0000000
Binary files a/deps/osx/sbcl-1.2.11-x86-64-darwin-binary.tar.bz2 and /dev/null differ
diff --git a/deps/osx/sbcl-1.2.13-source.tar.bz2 b/deps/osx/sbcl-1.2.13-source.tar.bz2
deleted file mode 100644 (file)
index f6d6014..0000000
Binary files a/deps/osx/sbcl-1.2.13-source.tar.bz2 and /dev/null differ
diff --git a/deps/windows/freeglut.dll b/deps/windows/freeglut.dll
deleted file mode 100755 (executable)
index c768c15..0000000
Binary files a/deps/windows/freeglut.dll and /dev/null differ
diff --git a/deps/windows/pdcurses.dll b/deps/windows/pdcurses.dll
deleted file mode 100755 (executable)
index 550c7a2..0000000
Binary files a/deps/windows/pdcurses.dll and /dev/null differ
diff --git a/deps/windows/sbcl-1.2.14-x86-windows-binary.msi b/deps/windows/sbcl-1.2.14-x86-windows-binary.msi
deleted file mode 100755 (executable)
index 5e0e484..0000000
Binary files a/deps/windows/sbcl-1.2.14-x86-windows-binary.msi and /dev/null differ
diff --git a/dist/osx/CLNL.app/Contents/Info.plist b/dist/osx/CLNL.app/Contents/Info.plist
deleted file mode 100644 (file)
index 68cf504..0000000
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-  <key>CFBundleName</key>
-  <string>CLNL</string>
-  <key>CFBundleIdentifier</key>
-  <string>net.kank.clnl</string>
-  <key>CFBundleVersion</key>
-  <string>0.0.1.20150904</string>
-  <key>CFBundleIconFile</key>
-  <string>CLNL.icns</string>
-</dict>
-</plist>
diff --git a/dist/osx/CLNL.app/Contents/MacOS/CLNL b/dist/osx/CLNL.app/Contents/MacOS/CLNL
deleted file mode 100755 (executable)
index 790cc97..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/usr/bin/env bash
-
-open -a Terminal $(dirname $0)/osxsbcl
diff --git a/dist/osx/CLNL.app/Contents/Resources/CLNL.icns b/dist/osx/CLNL.app/Contents/Resources/CLNL.icns
deleted file mode 100644 (file)
index 41bb399..0000000
Binary files a/dist/osx/CLNL.app/Contents/Resources/CLNL.icns and /dev/null differ
index e9698c11f0e24f3e0d693a72e5e284793e58e469..8711634c38b20d87b5b6d28d276c54f4f33cce9f 100644 (file)
@@ -57,6 +57,10 @@ Each milestone is made up of the commit messages leading up to it.  Any commit t
 
 # Changelog
 
+## [0.1.1 - Interim Release](https://code.consxy.com/gitweb/gitweb.cgi/clnl/commit/0.1.1)
+
+This release was after we moved from github to consxy, and so old releases were lost.
+
 ## [0.1 - Engine - Wolf Sheep works](https://code.consxy.com/gitweb/gitweb.cgi/clnl/commit/v0.1.0)
 * [x] Parse models v1 - sections - [c49ca54](http://code.consxy.com/gitweb/gitweb.cgi/clnl/commit/c49ca54)
 * [x] Parse widgets v1 - view - [2d8a7c9](http://code.consxy.com/gitweb/gitweb.cgi/clnl/commit/2d8a7c9)