summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuke Shumaker <LukeShu@sbcglobal.net>2013-07-16 21:52:01 -0600
committerLuke Shumaker <LukeShu@sbcglobal.net>2013-07-16 21:52:01 -0600
commitce3d10a93232a1dca8018674fc59f9682bfd8e4c (patch)
tree32dab1d26a3005f41c3b4adc87aebe3c72d389a7
parent58aac8f5c87d81df4d79c8e744ba4edbeb6e5065 (diff)
update to have running `make` be optionalv20130716
-rw-r--r--depends_make.txt6
-rw-r--r--depends_static.txt1
-rwxr-xr-xparabolaweb-update11
-rw-r--r--parabolaweb.conf6
4 files changed, 19 insertions, 5 deletions
diff --git a/depends_make.txt b/depends_make.txt
new file mode 100644
index 0000000..9cfb318
--- /dev/null
+++ b/depends_make.txt
@@ -0,0 +1,6 @@
+closure-compiler # for .min.js
+wget
+inkscape # Artwork: SVG2PNG
+icoutils # Artwork: PNG2ICO
+pngcrush # Artwork: PNGCRISH
+gsfonts # Artwork
diff --git a/depends_static.txt b/depends_static.txt
index 3e13323..1921bf6 100644
--- a/depends_static.txt
+++ b/depends_static.txt
@@ -1,4 +1,3 @@
-closure-compiler # for .min.js
libretools # used in parabolaweb-update (libremessages, libregit)
postgresql # for database
python2 # duh
diff --git a/parabolaweb-update b/parabolaweb-update
index 498f11a..b868c91 100755
--- a/parabolaweb-update
+++ b/parabolaweb-update
@@ -22,8 +22,10 @@ clean() {
cd "$WEBDIR"
msg "Purging old .pyc files..."
find . -name '*.pyc' -delete
- msg "Purging old GNU Make generated files..."
- make clean
+ if $RUNMAKE; then
+ msg "Purging old GNU Make generated files..."
+ make clean
+ fi
}
configure() {
@@ -62,7 +64,10 @@ update-database() {
update-filesystem() {
cd "$WEBDIR"
msg "Updating filesystem..."
- make
+ if $RUNMAKE; then
+ msg2 "Re-creating GNU Make generated files..."
+ make
+ fi
msg2 "Collecting static files..."
echo yes | ./manage.py collectstatic -l
}
diff --git a/parabolaweb.conf b/parabolaweb.conf
index 5363479..fbabc65 100644
--- a/parabolaweb.conf
+++ b/parabolaweb.conf
@@ -1,6 +1,10 @@
HOST=127.0.0.1
PORT=8090 # 80 is nginx
-WEBDIR=/srv/http/web
WEBUSER=nobody
+
+WEBDIR=/srv/http/web
+
GITURL=git://parabolagnulinux.org/parabolaweb.git
GITREF=master
+
+RUNMAKE=false