0.1.0 Release - Engine - Wolf sheep works

diff --git a/README.md b/README.md
index c5b7d585e29b36f275b47197d34c6fe07a3eff66..80ceb768a30464ea2d1290ed16214a8c93eaa847 100644 (file)
--- a/README.md
+++ b/README.md
@@ -4,11 +4,18 @@ This is an experiment at creating an alternate implementation of NetLogo in Comm
 
 See the [wiki](https://github.com/frankduncan/clnl/wiki) for more information.
 
+# Using standalone executables
+
+Find the latest version, [0.1.0](https://github.com/frankduncan/clnl/releases/tag/v0.1.0) on the [releases page](https://github.com/frankduncan/clnl/releases):
+* [linux](https://github.com/frankduncan/clnl/releases/download/v0.1.0/clnl)
+* [windows](https://github.com/frankduncan/clnl/releases/download/v0.1.0/clnl.exe)
+* [mac](https://github.com/frankduncan/clnl/releases/download/v0.1.0/CLNL.dmg)
+
 # 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 (either from the [releases page](https://github.com/frankduncan/clnl/releases) or via cloning)
+* A copy of the clnl source (either from the [releases page](https://github.com/frankduncan/clnl/releases), version [0.1.0](https://github.com/frankduncan/clnl/releases/download/v0.1.0/clnl_0.1.0.tar.gz) or via cloning)
 * An implementation of sbcl with threads enabled
 * The following common lisp libraries (included in [deps/common-lisp](deps/common-lisp) folder)
   * alexandria
@@ -49,7 +56,3 @@ If you'd like to run using your own sbcl instance, you can attach the clnl.asd f
 (asdf:load-system :clnl)
 (clnl:run)
 ```
-
-# Using standalone executables
-
-See the [releases page](https://github.com/frankduncan/clnl/releases) for the most recent release.

diff --git a/bin/buildosxexec.sh b/bin/buildosxexec.sh
index 963973e8f3a021f55e18e06a6c59126ed6d7a7a1..1d9351b988ee3e11dbe1fd3d7abd8ffb7ba4d0bd 100755 (executable)
--- a/bin/buildosxexec.sh
+++ b/bin/buildosxexec.sh
@@ -35,8 +35,9 @@ mkdir -p tmp/deps/
 
 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\") (:directory \"${PWD}/src/main\") :IGNORE-INHERITED-CONFIGURATION))" \
+  --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))' \
 

diff --git a/bin/buildwindowsexec.sh b/bin/buildwindowsexec.sh
index 45ffe76841630e9df78190aebd5221d67552a1ba..a1d2c289fef3e7ed44baf99cd823ae541869f177 100755 (executable)
--- a/bin/buildwindowsexec.sh
+++ b/bin/buildwindowsexec.sh
@@ -45,8 +45,9 @@ 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\") (:directory \"${escaped_cur_dir}\\\\src\\\\main\") :IGNORE-INHERITED-CONFIGURATION))" \
+  --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))'
 

diff --git a/bin/generatedocs.sh b/bin/generatedocs.sh
index ac3cce39e989359623ad3697cb18be668dfad64c..c445a35e7a880d119feeb3a56739a1818045a7c9 100755 (executable)
--- a/bin/generatedocs.sh
+++ b/bin/generatedocs.sh
@@ -17,5 +17,6 @@ generatedoc :clnl-cli > wiki/DocsOtherPackages.md
 generatedoc :clnl-lexer >> wiki/DocsOtherPackages.md
 generatedoc :clnl-parser >> wiki/DocsOtherPackages.md
 generatedoc :clnl-transpiler >> wiki/DocsOtherPackages.md
-generatedoc :clnl-random >> wiki/DocsOtherPackages.md
+generatedoc :clnl-code-parser >> wiki/DocsOtherPackages.md
 generatedoc :clnl-model >> wiki/DocsOtherPackages.md
+generatedoc :clnl-random >> wiki/DocsOtherPackages.md

diff --git a/bin/release.sh b/bin/release.sh
index 6a78757fa7982caf4225b0924a39dc6c8a89eb04..d399e6eb3a407caf23901f162e2e075ca3b1e97f 100755 (executable)
--- a/bin/release.sh
+++ b/bin/release.sh
@@ -2,13 +2,15 @@
 
 # The release process:
 #  * Change version number in clnl.asd
-#  * Run this script to create the source tarball
+#  * Change where the README.md points to releases
 #  * Run bin/generatedocs.sh to update wiki
-#  * Create release on github (that should create the tag)
-#  * Upload the tar.gz as an extra file
 #  * 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 release on github (that should create the tag), use v<MAJOR>.<MINOR>.<PATCH> as the versioning scheme
+#  * Upload the tar.gz as an extra file
 #  * Set the tag in wiki milestones, update Running wiki page to point to new release
 
 version=$(sbcl --noinform --disable-ldb --lose-on-corruption --end-runtime-options --eval '(format t "~A" (asdf:component-version (asdf:find-system :clnl)))' --eval "(quit)")

diff --git a/src/main/clnl.asd b/src/main/clnl.asd
index 58bd44bfd0729768d94cee90a1d14c2e8501c499..e70faf0a1ffbddd00d22d84e7e02894512da213d 100644 (file)
--- a/src/main/clnl.asd
+++ b/src/main/clnl.asd
@@ -1,6 +1,6 @@
 (asdf:defsystem clnl
  :name "Experiment"
- :version "0.0.0"
+ :version "0.1.0"
  :maintainer "Frank Duncan (frank@kank.com)"
  :author "Frank Duncan (frank@kank.com)"
  :components ((:file "package")

diff --git a/src/main/interface.lisp b/src/main/interface.lisp
index 931cede5143f633bf5a66bca3e891658dc23fb2d..88dfac51c42b16b38a3120714a80435dc9a31076 100644 (file)
--- a/src/main/interface.lisp
+++ b/src/main/interface.lisp
@@ -6,6 +6,8 @@
 (defvar *glut-window-opened* nil)
 (defvar *dimensions* nil)
 
+(defvar *default-shapes* nil)
+
 ; For now, shapes can live in here
 ; header is
 ; * name <like default>
@@ -182,6 +184,10 @@
 (defun default-shapes ()
  (with-open-file (str "resources/defaultshapes") (parse-shapes str)))
 
+(eval-when (:load-toplevel)
+ (when (probe-file "resources/defaultshapes")
+  (setf *default-shapes* (default-shapes))))
+
 (defvar *colors*
  '((140 140 140) ; gray       (5)
    (215 48 39) ; red       (15)
@@ -290,7 +296,7 @@
       (gl:translate -150d0 -150d0 -0.0d0)
       (mapcar #'element->gl-list (getf shape :elements)))
      turtle-list))
-   (default-shapes))))
+   (or *default-shapes* (default-shapes)))))
 
 (defun set-patch-list ()
  (setf *patch-list* (gl:gen-lists 1))

diff --git a/wiki b/wiki
index 769e5e8f99137d05ee9ea7eb5232d923f14b6286..5aa4443b92dcdd79e08ba82e64702dcdf239e2fe 160000 (submodule)
--- a/wiki
+++ b/wiki
@@ -1 +1 @@
-Subproject commit 769e5e8f99137d05ee9ea7eb5232d923f14b6286
+Subproject commit 5aa4443b92dcdd79e08ba82e64702dcdf239e2fe