summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortv <tv@nomic.retiolum>2013-11-06 17:27:07 +0100
committertv <tv@nomic.retiolum>2013-11-06 17:27:07 +0100
commit2ad3bb39e58f594ea1299a2b4ed36ee3f63e49d4 (patch)
tree242ac156a453a7794b8d5e6e825dc64749c9f442
parent16a4cda248de734f3771c0bb721ec1834ad96cc8 (diff)
ship: mv bin src && mv out tmp
-rw-r--r--.gitignore2
-rwxr-xr-xship/deploy10
-rwxr-xr-xship/src/punani (renamed from ship/bin/punani)0
-rw-r--r--ship/tmp/.placeholder (renamed from ship/out/.placeholder)0
4 files changed, 6 insertions, 6 deletions
diff --git a/.gitignore b/.gitignore
index 4ccc216f..e2b93f24 100644
--- a/.gitignore
+++ b/.gitignore
@@ -28,6 +28,6 @@ a.out
/ovh/soapi/SOAPpy
/Reaktor/IRC/irclib.py
/Reaktor/public_commands/*
-/ship/out
+/ship/tmp
/webchat/node_modules
/webchat/local_config
diff --git a/ship/deploy b/ship/deploy
index 411f8eec..cb71d570 100755
--- a/ship/deploy
+++ b/ship/deploy
@@ -1,9 +1,9 @@
#!/bin/sh
set -xeuf
cd $(dirname $0)
-bindir=$PWD/bin
-libdir=$PWD/lib
-outdir=$PWD/out
-for file in `ls -1 $bindir`;do
- BUILD_PATH=$libdir ./build compile $bindir/$file $outdir/$file
+exesrcdir=src
+libsrcdir=lib
+tmpoutdir=tmp
+for file in `ls $exesrcdir`; do
+ BUILD_PATH=$libsrcdir ./build compile $exesrcdir/$file $tmpoutdir/$file
done
diff --git a/ship/bin/punani b/ship/src/punani
index ceabd667..ceabd667 100755
--- a/ship/bin/punani
+++ b/ship/src/punani
diff --git a/ship/out/.placeholder b/ship/tmp/.placeholder
index e69de29b..e69de29b 100644
--- a/ship/out/.placeholder
+++ b/ship/tmp/.placeholder