summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>2012-03-11 14:37:58 (GMT)
committerJeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>2012-03-11 14:37:58 (GMT)
commit834aace42d3a452a8f34437fa776154e3036e1e3 (patch)
tree523fdad53912d32c5e44f051ddf302e7df7bc45a
parent6e19989dd26bff83452c5a2a783d41d5c612ef37 (diff)
downloadkolab-docs-834aace42d3a452a8f34437fa776154e3036e1e3.tar.gz
Update the makefiles to no longer test for whether a repository is clean or not
-rw-r--r--About_Kolab_Groupware/Makefile9
-rw-r--r--Administrator_Guide/Makefile9
-rw-r--r--Architecture_and_Design/Makefile9
-rw-r--r--Deployment_Guide/Makefile9
-rw-r--r--Development_Manual/Makefile9
-rw-r--r--Installation_Guide/Makefile16
-rw-r--r--Makefile1
-rw-r--r--Release_Notes/Makefile9
-rw-r--r--Testing_Reference/Makefile9
9 files changed, 17 insertions, 63 deletions
diff --git a/About_Kolab_Groupware/Makefile b/About_Kolab_Groupware/Makefile
index 8fc349a..82cf4ef 100644
--- a/About_Kolab_Groupware/Makefile
+++ b/About_Kolab_Groupware/Makefile
@@ -1,13 +1,8 @@
PACKAGE = "About_Kolab_Groupware"
all: clean clean_ids
- @if [ -z "`git status . 2>&1 | grep \"working directory clean\"`" ]; then \
- publican build --embedtoc --publish --langs=all --formats=html,html-single,pdf; \
- publican install_book --site_config=../site.cfg --lang=en-US; \
- fi
-
-upload: all
- @rsync -aHvz publish/home/ hosted.kolabsys.com:./public_html/kolab-docs/
+ publican build --embedtoc --publish --langs=all --formats=html,html-single,pdf
+ publican install_book --site_config=../site.cfg --lang=en-US
clean:
@publican clean
diff --git a/Administrator_Guide/Makefile b/Administrator_Guide/Makefile
index 6143644..1516938 100644
--- a/Administrator_Guide/Makefile
+++ b/Administrator_Guide/Makefile
@@ -1,13 +1,8 @@
PACKAGE = "Administrator_Guide"
all: clean clean_ids
- @if [ -z "`git status . 2>&1 | grep \"working directory clean\"`" ]; then \
- publican build --embedtoc --publish --langs=all --formats=html,html-single,pdf; \
- publican install_book --site_config=../site.cfg --lang=en-US; \
- fi
-
-upload: all
- @rsync -aHvz publish/en-US/ hosted.kolabsys.com:./public_html/kolab-docs/
+ publican build --embedtoc --publish --langs=all --formats=html,html-single,pdf
+ publican install_book --site_config=../site.cfg --lang=en-US
clean:
@publican clean
diff --git a/Architecture_and_Design/Makefile b/Architecture_and_Design/Makefile
index f71bd58..3def933 100644
--- a/Architecture_and_Design/Makefile
+++ b/Architecture_and_Design/Makefile
@@ -1,13 +1,8 @@
PACKAGE = "Architecture_and_Design"
all: clean clean_ids
- @if [ -z "`git status . 2>&1 | grep \"working directory clean\"`" ]; then \
- publican build --embedtoc --publish --langs=all --formats=html,html-single,pdf; \
- publican install_book --site_config=../site.cfg --lang=en-US; \
- fi
-
-upload: all
- @rsync -aHvz publish/en-US/ hosted.kolabsys.com:./public_html/kolab-docs/
+ publican build --embedtoc --publish --langs=all --formats=html,html-single,pdf
+ publican install_book --site_config=../site.cfg --lang=en-US
clean:
@publican clean
diff --git a/Deployment_Guide/Makefile b/Deployment_Guide/Makefile
index 699657a..a9a0067 100644
--- a/Deployment_Guide/Makefile
+++ b/Deployment_Guide/Makefile
@@ -1,13 +1,8 @@
PACKAGE = "Deployment_Guide"
all: clean clean_ids
- @if [ -z "`git status . 2>&1 | grep \"working directory clean\"`" ]; then \
- publican build --embedtoc --publish --langs=all --formats=html,html-single,pdf; \
- publican install_book --site_config=../site.cfg --lang=en-US; \
- fi
-
-upload: all
- @rsync -aHvz publish/en-US/ hosted.kolabsys.com:./public_html/kolab-docs/
+ publican build --embedtoc --publish --langs=all --formats=html,html-single,pdf
+ publican install_book --site_config=../site.cfg --lang=en-US
clean:
@publican clean
diff --git a/Development_Manual/Makefile b/Development_Manual/Makefile
index cb7b59d..6da5a94 100644
--- a/Development_Manual/Makefile
+++ b/Development_Manual/Makefile
@@ -1,13 +1,8 @@
PACKAGE = "Development_Manual"
all: clean clean_ids
- @if [ -z "`git status . 2>&1 | grep \"working directory clean\"`" ]; then \
- publican build --embedtoc --publish --langs=all --formats=html,html-single,pdf; \
- publican install_book --site_config=../site.cfg --lang=en-US; \
- fi
-
-upload: all
- @rsync -aHvz publish/en-US/ hosted.kolabsys.com:./public_html/kolab-docs/
+ publican build --embedtoc --publish --langs=all --formats=html,html-single,pdf
+ publican install_book --site_config=../site.cfg --lang=en-US
clean:
@publican clean
diff --git a/Installation_Guide/Makefile b/Installation_Guide/Makefile
index c7ec007..33fb445 100644
--- a/Installation_Guide/Makefile
+++ b/Installation_Guide/Makefile
@@ -1,21 +1,11 @@
PACKAGE = "Installation_Guide"
all: clean clean_ids
- @if [ -z "`git status . 2>&1 | grep \"working directory clean\"`" ]; then \
- for audience in enterprise community; do \
- sed -r -i -e "s/^condition:.*/condition: $$audience/g" publican.cfg; \
- sed -r -i -e "s/^docname:.*/docname: $$(echo $${audience:0:1} | tr '[:lower:]' '[:upper:]')$${audience:1}_$(PACKAGE)/g" publican.cfg; \
- publican build --embedtoc --publish --langs=en-US --formats=html,html-single,pdf; \
- publican install_book --site_config=../site.cfg --lang=en-US; \
- done; \
- fi
- @sed -r -i -e 's/^condition:.*/condition: community/g' publican.cfg
-
-upload: clean clean_ids
@for audience in enterprise community; do \
sed -r -i -e "s/^condition:.*/condition: $$audience/g" publican.cfg; \
- publican build --langs=en-US --formats=html,html-single,pdf; \
- rsync -aHvz tmp/en-US/{html,html-single,pdf} hosted.kolabsys.com:./public_html/kolab-2.4-docs/$$(echo $${audience:0:1} | tr '[:lower:]' '[:upper:]')$${audience:1}_$(PACKAGE)/; \
+ sed -r -i -e "s/^docname:.*/docname: $$(echo $${audience:0:1} | tr '[:lower:]' '[:upper:]')$${audience:1}_$(PACKAGE)/g" publican.cfg; \
+ publican build --embedtoc --publish --langs=en-US --formats=html,html-single,pdf; \
+ publican install_book --site_config=../site.cfg --lang=en-US; \
done
@sed -r -i -e 's/^condition:.*/condition: community/g' publican.cfg
diff --git a/Makefile b/Makefile
index b813c79..9a59673 100644
--- a/Makefile
+++ b/Makefile
@@ -15,7 +15,6 @@ all:
done
site: all
- # Do not synchronize ownership, times or permissions!
@rsync -rlHvz --progress --delete site/ docs.kolab.org:/var/www/kolab.org/docs/public_html/
upload: all
diff --git a/Release_Notes/Makefile b/Release_Notes/Makefile
index 4225189..e877174 100644
--- a/Release_Notes/Makefile
+++ b/Release_Notes/Makefile
@@ -1,13 +1,8 @@
PACKAGE = "Release_Notes"
all: clean clean_ids
- @if [ -z "`git status . 2>&1 | grep \"working directory clean\"`" ]; then \
- publican build --embedtoc --publish --langs=all --formats=html,html-single,pdf; \
- publican install_book --site_config=../site.cfg --lang=en-US; \
- fi
-
-upload: all
- @rsync -aHvz publish/en-US/ hosted.kolabsys.com:./public_html/kolab-docs/
+ publican build --embedtoc --publish --langs=all --formats=html,html-single,pdf
+ publican install_book --site_config=../site.cfg --lang=en-US
clean:
@publican clean
diff --git a/Testing_Reference/Makefile b/Testing_Reference/Makefile
index ea3439c..350c507 100644
--- a/Testing_Reference/Makefile
+++ b/Testing_Reference/Makefile
@@ -1,13 +1,8 @@
PACKAGE = "Testing_Reference"
all: clean clean_ids
- @if [ -z "`git status . 2>&1 | grep \"working directory clean\"`" ]; then \
- publican build --embedtoc --publish --langs=all --formats=html,html-single,pdf; \
- publican install_book --site_config=../site.cfg --lang=en-US; \
- fi
-
-upload: all
- @rsync -aHvz publish/en-US/ hosted.kolabsys.com:./public_html/kolab-docs/
+ publican build --embedtoc --publish --langs=all --formats=html,html-single,pdf
+ publican install_book --site_config=../site.cfg --lang=en-US
clean:
@publican clean