Merge pull request #2 from aw/destroy-submodules

Get rid of git submodules.

Author: aw

.gitignore

@@ -1 +1,2 @@
-lib/*.so
+.lib/
+.modules/

.gitmodules

@@ -3,10 +3,11 @@ sudo: false
 cache: apt
 
 before_script:
-  - ./build.sh
+  - make
   - wget http://software-lab.de/picoLisp.tgz -O /tmp/picolisp.tgz
   - cd /tmp; tar -xf /tmp/picolisp.tgz
   - cd /tmp/picoLisp/src64 && make
 
 script:
-  - cd ${TRAVIS_BUILD_DIR} && /tmp/picoLisp/pil test.l
+  - export PATH=$PATH:/tmp/picoLisp
+  - cd ${TRAVIS_BUILD_DIR} && make check

.travis.yml

@@ -1,42 +1,49 @@
 # Changelog
 
-## 0.5.26 (2014-04-23)
+## 0.5.27 (2015-04-28)
+
+  * Remove the need for git submodules
+  * Add Makefile for fetching and building dependencies
+  * Change default path for dependencies and shared module (.modules and .lib)
+  * Adjust README.md, tests and travis-ci unit testing config
+
+## 0.5.26 (2015-04-23)
 
   * Replace (cond) with (case)
 
-## 0.5.25 (2014-04-15)
+## 0.5.25 (2015-04-15)
 
   * Split 'make-socket' for more flexibility
   * Update EXPLAIN.md
 
-## 0.5.24 (2014-04-14)
+## 0.5.24 (2015-04-14)
 
   * Update to picolisp-unit v0.6.1
   * Run travis-ci tests in a docker container
 
-## 0.5.23 (2014-04-08)
+## 0.5.23 (2015-04-08)
 
   * Split the 'make-socket' function to allow pooled connections
   * Ensure travis tests with the latest version of PicoLisp
 
-## 0.5.22 (2014-04-07)
+## 0.5.22 (2015-04-07)
 
   * Update to picolisp-unit v0.6.0
   * Ignore dirty submodules
 
-## 0.5.21 (2014-04-01)
+## 0.5.21 (2015-04-01)
 
   * Update to picolisp-unit v0.5.2
 
-## 0.5.20 (2014-03-24)
+## 0.5.20 (2015-03-24)
 
   * Add test for sending/receiving messages
 
-## 0.5.19 (2014-03-24)
+## 0.5.19 (2015-03-24)
 
   * Swap order of module.l loading
 
-## 0.5.18 (2014-03-24)
+## 0.5.18 (2015-03-24)
 
   * Don't forget to load module.l
 

CHANGELOG.md

@@ -0,0 +1,55 @@
+# Makefile
+
+PIL_MODULE_DIR ?= .modules
+PIL_SYMLINK_DIR ?= .lib
+
+## Edit below
+BUILD_REPO = https://github.com/nanomsg/nanomsg.git
+BUILD_DIR = $(PIL_MODULE_DIR)/nanomsg/HEAD
+LIB_DIR = .libs
+TARGET = libnanomsg.so
+BFLAGS = --enable-shared
+## Edit above
+
+# Unit testing
+TEST_REPO = https://github.com/aw/picolisp-unit.git
+TEST_DIR = $(PIL_MODULE_DIR)/picolisp-unit/HEAD
+
+# Generic
+COMPILE = make
+
+.PHONY: all clean
+
+all: $(BUILD_DIR) $(BUILD_DIR)/$(LIB_DIR)/$(TARGET) symlink
+
+$(BUILD_DIR):
+		mkdir -p $(BUILD_DIR) && \
+		git clone $(BUILD_REPO) $(BUILD_DIR)
+
+$(TEST_DIR):
+		mkdir -p $(TEST_DIR) && \
+		git clone $(TEST_REPO) $(TEST_DIR)
+
+$(BUILD_DIR)/$(LIB_DIR)/$(TARGET):
+		cd $(BUILD_DIR) && \
+		./autogen.sh && \
+		./configure $(BFLAGS) && \
+		$(COMPILE) && \
+		strip --strip-unneeded $(LIB_DIR)/$(TARGET)
+
+symlink:
+		mkdir -p $(PIL_SYMLINK_DIR) && \
+		cd $(PIL_SYMLINK_DIR) && \
+		ln -sf ../$(BUILD_DIR)/$(LIB_DIR)/$(TARGET) $(TARGET)
+
+check: all $(TEST_DIR) run-tests
+
+run-tests:
+		./test.l
+
+clean:
+		cd $(BUILD_DIR)/$(LIB_DIR) && \
+		rm -f $(TARGET) && \
+		cd - && \
+		cd $(PIL_SYMLINK_DIR) && \
+		rm -f $(TARGET)

Makefile

@@ -25,23 +25,25 @@ To learn more about PicoLisp and this Nanomsg library, please read the [EXPLAIN.
 
 # Getting started
 
-This binding relies on the _Official Nanomsg C Library_, compiled as a shared library. It is included here as a [git submodule](http://git-scm.com/book/en/v2/Git-Tools-Submodules).
+This binding relies on the _Official Nanomsg C Library_, compiled as a shared library.
 
-  1. Type `./build.sh` to pull and compile the _Official Nanomsg C Library_.
+  1. Type `make` to pull and compile the _Official Nanomsg C Library_.
   2. Include `nanomsg.l` in your project
   3. Try the example below
 
 ### Linking and Paths
 
-Once compiled, the shared library is symlinked in `lib/libnanomsg.so` pointing to `vendor/nanomsg/.libs/libnanomsg.so`.
+Once compiled, the shared library is symlinked as:
 
-The `nanomsg.l` file searches for `lib/libnanomsg.so`, relative to its current directory.
+    .lib/libnanomsg.so -> .modules/nanomsg/HEAD/src/.libs/libnanomsg.so
+
+The `nanomsg.l` file searches for `.lib/libnanomsg.so`, relative to its current directory.
 
 ### Updating
 
-This library uses git submodules, type this keep everything updated:
+To keep everything updated, type:
 
-    ./update.sh
+    git pull && make clean && make
 
 # Usage
 
@@ -322,9 +324,9 @@ This can be changed with the environment variable `NANOMSG_MAX_SIZE`. You can al
 
 # Testing
 
-This library now comes with full [unit tests](https://github.com/aw/picolisp-unit). To run the tests, run:
+This library now comes with full [unit tests](https://github.com/aw/picolisp-unit). To run the tests, type:
 
-    ./test.l
+    make check
 
 # Contributing
 

README.md

@@ -2,20 +2,14 @@
 #
 # Copyright (c) 2015 Alexander Williams, Unscramble <license@unscramble.jp>
 # MIT License
+#
+# For backwards compatibility
 
 set -u
 set -e
 
-git submodule init
-git submodule update
-
-cd vendor/nanomsg
-  ./autogen.sh
-  ./configure --enable-shared
-  make
-cd -
+# cleanup artifacts
+rm -rf lib vendor
 
-cd lib
-  rm -f libnanomsg.so
-  ln -s ../vendor/nanomsg/.libs/libnanomsg.so libnanomsg.so
-cd -
+# rebuild
+make

build.sh

@@ -1,13 +1,12 @@
 [de MODULE_INFO
   ("name"       "nanomsg")
-  ("version"    "0.5.26")
+  ("version"    "0.5.27")
   ("summary"    "Nanomsg ffi-binding for PicoLisp")
   ("source"     "https://github.com/aw/picolisp-nanomsg.git")
   ("author"     "Alexander Williams")
   ("license"    "MIT")
   ("copyright"  "(c) 2015 Alexander Williams, Unscramble <license@unscramble.jp>")
-  ("install"    "build.sh")
-  ("update"     "update.sh")
+  ("install"    "make")
   ("requires"
     ("picolisp-unit"   "v0.6.1"      "https://github.com/aw/picolisp-unit.git")
     ("nanomsg"         "0.5-beta"    "https://github.com/nanomsg/nanomsg.git") ]

lib/.keep

@@ -17,7 +17,7 @@
 (setq
   MSG_MAX_SIZE (if (sys "NANOMSG_MAX_SIZE") (format @) 8192) # 8KB should be enough
 
-  *Nanomsg (pack (car (file)) "lib/libnanomsg.so") )
+  *Nanomsg (pack (car (file)) ".lib/libnanomsg.so") )
 
 # ffi-bindings
 [de nn-socket (Domain Protocol)

module.l

@@ -1,6 +1,6 @@
 #!/usr/bin/env pil
 
-(load "vendor/picolisp-unit/unit.l")
+(load ".modules/picolisp-unit/HEAD/unit.l")
 
 (chdir "test/"
   (mapcar load (filter '((N) (sub? "test_" N)) (dir "."))) )