aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Makefile19
-rw-r--r--README22
2 files changed, 40 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 26f5bd0..6ef77cc 100644
--- a/Makefile
+++ b/Makefile
@@ -2,7 +2,7 @@ EMACS=emacs -q --no-site-file
all: fripost-web
-fripost-web:
+fripost-web: # creates home page
$(EMACS) -batch -L . \
-l "fripost-web.el" \
-eval "(org-publish-project \"fripost-web\")"
@@ -10,3 +10,20 @@ fripost-web:
find publish -iname "*.html" -exec perl -pi -e 's!\\ndash!–!' {} \;
# Remove Emacs backup files
find publish -name "*~" -delete
+
+send: # sends to fripost.org for publication
+ rsync -ruvp publish/ fripost@fripost.org/fripost.org/
+
+clean:
+ rm *~*; rm test test.d/test; rmdir test.d
+
+# Debuging and testing
+send-test: test.d/test
+ rsync -ruvp test.d/ fripost@fripost.org:fripost.org/
+
+test.d/test: test.d
+ echo This is the test file for fripost-web. > test.d/test
+test.d:
+ mkdir test.d
+
+
diff --git a/README b/README
index da82c32..3cd7e2b 100644
--- a/README
+++ b/README
@@ -1,3 +1,25 @@
This repository contains the website of Fripost.
http://fripost.org/
+
+Use make to compile the page and copy it to fripost.org
+
+ # compilation
+ $ make
+
+ # pulication
+ $ make send
+
+This is the standard project workflow
+
+ 1. Pull all repositories (ask Gustav and Stefan)
+ 2. Perform local changes
+ - One change, one commit
+ 3. Compile and check ocularly locally through web browser
+ 4. Send to fripost.org
+ - Perform an ocular check on fripost.org
+ 5. Push changes to your repository
+
+(C) Copyright cc-by-sa 2010-2011 Gustav Eek and Stefan Kangas.
+
+You are free to use, change and redistribute this source according to the terms defined by Creative Commons Licence 3.0 Contribution Share Alike.