* [Cluster-devel] conga/luci cluster/Makefile homebase/Makefile ...
@ 2006-08-16 14:59 rmccabe
0 siblings, 0 replies; 4+ messages in thread
From: rmccabe @ 2006-08-16 14:59 UTC (permalink / raw)
To: cluster-devel.redhat.com
CVSROOT: /cvs/cluster
Module name: conga
Changes by: rmccabe at sourceware.org 2006-08-16 14:59:56
Modified files:
luci/cluster : Makefile
luci/homebase : Makefile
luci/plone-custom: Makefile
luci/storage : Makefile
Log message:
return true and do nothing more when issuing a 'make' with no arguments in the page template directories (it used to default to make import)
Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/cluster/Makefile.diff?cvsroot=cluster&r1=1.4&r2=1.5
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/homebase/Makefile.diff?cvsroot=cluster&r1=1.4&r2=1.5
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/plone-custom/Makefile.diff?cvsroot=cluster&r1=1.1&r2=1.2
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/storage/Makefile.diff?cvsroot=cluster&r1=1.4&r2=1.5
--- conga/luci/cluster/Makefile 2006/07/14 20:08:33 1.4
+++ conga/luci/cluster/Makefile 2006/08/16 14:59:56 1.5
@@ -3,6 +3,9 @@
LUCI_FTP=luci:8021
LUCI_HTTP=http://luci:8080/luci
+all:
+ @true
+
# import page local page templates to the Luci server
import:
@if test "$(FILES)"; then \
--- conga/luci/homebase/Makefile 2006/07/14 20:08:33 1.4
+++ conga/luci/homebase/Makefile 2006/08/16 14:59:56 1.5
@@ -3,6 +3,9 @@
LUCI_FTP=luci:8021
LUCI_HTTP=http://luci:8080/luci
+all:
+ @true
+
# import page local page templates to the Luci server
import:
@if test "$(FILES)"; then \
--- conga/luci/plone-custom/Makefile 2006/07/26 16:55:37 1.1
+++ conga/luci/plone-custom/Makefile 2006/08/16 14:59:56 1.2
@@ -3,6 +3,9 @@
LUCI_FTP=luci:8021
LUCI_HTTP=http://luci:8080/luci
+all:
+ @true
+
# import page local page templates to the Luci server
import:
@if test "$(FILES)"; then \
--- conga/luci/storage/Makefile 2006/07/14 20:08:33 1.4
+++ conga/luci/storage/Makefile 2006/08/16 14:59:56 1.5
@@ -3,6 +3,9 @@
LUCI_FTP=luci:8021
LUCI_HTTP=http://luci:8080/luci
+all:
+ @true
+
# import page local page templates to the Luci server
import:
@if test "$(FILES)"; then \
^ permalink raw reply [flat|nested] 4+ messages in thread
* [Cluster-devel] conga/luci cluster/Makefile homebase/Makefile ...
@ 2006-10-05 15:01 kupcevic
0 siblings, 0 replies; 4+ messages in thread
From: kupcevic @ 2006-10-05 15:01 UTC (permalink / raw)
To: cluster-devel.redhat.com
CVSROOT: /cvs/cluster
Module name: conga
Changes by: kupcevic at sourceware.org 2006-10-05 15:01:40
Modified files:
luci/cluster : Makefile
luci/homebase : Makefile
luci/init.d : luci
luci/plone-custom: Makefile
luci/storage : Makefile
Log message:
luci Data.fs import/export scripts:
- skip Makefile*
- define LUCI_HOST
Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/cluster/Makefile.diff?cvsroot=cluster&r1=1.5&r2=1.6
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/homebase/Makefile.diff?cvsroot=cluster&r1=1.5&r2=1.6
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/init.d/luci.diff?cvsroot=cluster&r1=1.10&r2=1.11
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/plone-custom/Makefile.diff?cvsroot=cluster&r1=1.2&r2=1.3
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/storage/Makefile.diff?cvsroot=cluster&r1=1.5&r2=1.6
--- conga/luci/cluster/Makefile 2006/08/16 14:59:56 1.5
+++ conga/luci/cluster/Makefile 2006/10/05 15:01:39 1.6
@@ -1,7 +1,8 @@
+LUCI_HOST=luci
LUCI_USER=admin
LUCI_PASS=changeme
-LUCI_FTP=luci:8021
-LUCI_HTTP=http://luci:8080/luci
+LUCI_FTP=$(LUCI_HOST):8021
+LUCI_HTTP=http://$(LUCI_HOST):8080/luci
all:
@true
@@ -11,7 +12,7 @@
@if test "$(FILES)"; then \
../load_site.py -u $(LUCI_USER):$(LUCI_PASS) $(LUCI_HTTP)/cluster/ $(FILES) ; \
else \
- find . -follow -maxdepth 1 -type f -not -name Makefile -not -name ".*" -print0 | xargs -0 ../load_site.py -u $(LUCI_USER):$(LUCI_PASS) $(LUCI_HTTP)/cluster/ ; \
+ find . -follow -maxdepth 1 -type f -not -name "Makefile*" -not -name ".*" -print0 | xargs -0 ../load_site.py -u $(LUCI_USER):$(LUCI_PASS) $(LUCI_HTTP)/cluster/ ; \
fi
export:
--- conga/luci/homebase/Makefile 2006/08/16 14:59:56 1.5
+++ conga/luci/homebase/Makefile 2006/10/05 15:01:39 1.6
@@ -1,7 +1,8 @@
+LUCI_HOST=luci
LUCI_USER=admin
LUCI_PASS=changeme
-LUCI_FTP=luci:8021
-LUCI_HTTP=http://luci:8080/luci
+LUCI_FTP=$(LUCI_HOST):8021
+LUCI_HTTP=http://$(LUCI_HOST):8080/luci
all:
@true
@@ -11,7 +12,7 @@
@if test "$(FILES)"; then \
../load_site.py -u $(LUCI_USER):$(LUCI_PASS) $(LUCI_HTTP)/homebase/ $(FILES) ; \
else \
- find . -follow -maxdepth 1 -type f -not -name Makefile -not -name ".*" -print0 | xargs -0 ../load_site.py -u $(LUCI_USER):$(LUCI_PASS) $(LUCI_HTTP)/homebase/ ; \
+ find . -follow -maxdepth 1 -type f -not -name "Makefile*" -not -name ".*" -print0 | xargs -0 ../load_site.py -u $(LUCI_USER):$(LUCI_PASS) $(LUCI_HTTP)/homebase/ ; \
fi
export:
--- conga/luci/init.d/luci 2006/10/03 18:23:30 1.10
+++ conga/luci/init.d/luci 2006/10/05 15:01:39 1.11
@@ -32,7 +32,7 @@
LUCI_USER="luci"
LUCI_GROUP="luci"
-LUCI_URL="https://$HOSTNAME:$LUCI_HTTPS_PORT"
+LUCI_URL="https://`/bin/hostname`:$LUCI_HTTPS_PORT"
HTTPS_PUBKEY="/var/lib/luci/var/certs/https.pem"
HTTPS_PRIVKEY="/var/lib/luci/var/certs/https.key.pem"
--- conga/luci/plone-custom/Makefile 2006/08/16 14:59:56 1.2
+++ conga/luci/plone-custom/Makefile 2006/10/05 15:01:40 1.3
@@ -1,7 +1,8 @@
+LUCI_HOST=luci
LUCI_USER=admin
LUCI_PASS=changeme
-LUCI_FTP=luci:8021
-LUCI_HTTP=http://luci:8080/luci
+LUCI_FTP=$(LUCI_HOST):8021
+LUCI_HTTP=http://$(LUCI_HOST):8080/luci
all:
@true
@@ -11,7 +12,7 @@
@if test "$(FILES)"; then \
../load_site.py -u $(LUCI_USER):$(LUCI_PASS) $(LUCI_HTTP)/portal_skins/custom/ $(FILES) ; \
else \
- find . -follow -maxdepth 1 -type f -not -name Makefile -not -name ".*" -not -name custom.xml -not -name README -print0 | xargs -0 ../load_site.py -u $(LUCI_USER):$(LUCI_PASS) $(LUCI_HTTP)/portal_skins/custom/ ; \
+ find . -follow -maxdepth 1 -type f -not -name "Makefile*" -not -name ".*" -not -name custom.xml -not -name README -print0 | xargs -0 ../load_site.py -u $(LUCI_USER):$(LUCI_PASS) $(LUCI_HTTP)/portal_skins/custom/ ; \
fi
export:
--- conga/luci/storage/Makefile 2006/08/16 14:59:56 1.5
+++ conga/luci/storage/Makefile 2006/10/05 15:01:40 1.6
@@ -1,7 +1,8 @@
+LUCI_HOST=luci
LUCI_USER=admin
LUCI_PASS=changeme
-LUCI_FTP=luci:8021
-LUCI_HTTP=http://luci:8080/luci
+LUCI_FTP=$(LUCI_HOST):8021
+LUCI_HTTP=http://$(LUCI_HOST):8080/luci
all:
@true
@@ -11,7 +12,7 @@
@if test "$(FILES)"; then \
../load_site.py -u $(LUCI_USER):$(LUCI_PASS) $(LUCI_HTTP)/storage/ $(FILES) ; \
else \
- find . -follow -maxdepth 1 -type f -not -name Makefile -not -name ".*" -print0 | xargs -0 ../load_site.py -u $(LUCI_USER):$(LUCI_PASS) $(LUCI_HTTP)/storage/ ; \
+ find . -follow -maxdepth 1 -type f -not -name "Makefile*" -not -name ".*" -print0 | xargs -0 ../load_site.py -u $(LUCI_USER):$(LUCI_PASS) $(LUCI_HTTP)/storage/ ; \
fi
export:
^ permalink raw reply [flat|nested] 4+ messages in thread
* [Cluster-devel] conga/luci cluster/Makefile homebase/Makefile ...
@ 2006-07-14 20:08 rmccabe
0 siblings, 0 replies; 4+ messages in thread
From: rmccabe @ 2006-07-14 20:08 UTC (permalink / raw)
To: cluster-devel.redhat.com
CVSROOT: /cvs/cluster
Module name: conga
Changes by: rmccabe at sourceware.org 2006-07-14 20:08:33
Modified files:
luci/cluster : Makefile
luci/homebase : Makefile
luci/storage : Makefile
Log message:
add quotes around shell test
Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/cluster/Makefile.diff?cvsroot=cluster&r1=1.3&r2=1.4
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/homebase/Makefile.diff?cvsroot=cluster&r1=1.3&r2=1.4
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/storage/Makefile.diff?cvsroot=cluster&r1=1.3&r2=1.4
--- conga/luci/cluster/Makefile 2006/07/14 20:01:40 1.3
+++ conga/luci/cluster/Makefile 2006/07/14 20:08:33 1.4
@@ -5,7 +5,7 @@
# import page local page templates to the Luci server
import:
- @if test $(FILES); then \
+ @if test "$(FILES)"; then \
../load_site.py -u $(LUCI_USER):$(LUCI_PASS) $(LUCI_HTTP)/cluster/ $(FILES) ; \
else \
find . -follow -maxdepth 1 -type f -not -name Makefile -not -name ".*" -print0 | xargs -0 ../load_site.py -u $(LUCI_USER):$(LUCI_PASS) $(LUCI_HTTP)/cluster/ ; \
--- conga/luci/homebase/Makefile 2006/07/14 20:01:40 1.3
+++ conga/luci/homebase/Makefile 2006/07/14 20:08:33 1.4
@@ -5,7 +5,7 @@
# import page local page templates to the Luci server
import:
- @if test $(FILES); then \
+ @if test "$(FILES)"; then \
../load_site.py -u $(LUCI_USER):$(LUCI_PASS) $(LUCI_HTTP)/homebase/ $(FILES) ; \
else \
find . -follow -maxdepth 1 -type f -not -name Makefile -not -name ".*" -print0 | xargs -0 ../load_site.py -u $(LUCI_USER):$(LUCI_PASS) $(LUCI_HTTP)/homebase/ ; \
--- conga/luci/storage/Makefile 2006/07/14 20:01:41 1.3
+++ conga/luci/storage/Makefile 2006/07/14 20:08:33 1.4
@@ -5,7 +5,7 @@
# import page local page templates to the Luci server
import:
- @if test $(FILES); then \
+ @if test "$(FILES)"; then \
../load_site.py -u $(LUCI_USER):$(LUCI_PASS) $(LUCI_HTTP)/storage/ $(FILES) ; \
else \
find . -follow -maxdepth 1 -type f -not -name Makefile -not -name ".*" -print0 | xargs -0 ../load_site.py -u $(LUCI_USER):$(LUCI_PASS) $(LUCI_HTTP)/storage/ ; \
^ permalink raw reply [flat|nested] 4+ messages in thread
* [Cluster-devel] conga/luci cluster/Makefile homebase/Makefile ...
@ 2006-07-14 20:01 rmccabe
0 siblings, 0 replies; 4+ messages in thread
From: rmccabe @ 2006-07-14 20:01 UTC (permalink / raw)
To: cluster-devel.redhat.com
CVSROOT: /cvs/cluster
Module name: conga
Changes by: rmccabe at sourceware.org 2006-07-14 20:01:41
Modified files:
luci/cluster : Makefile
luci/homebase : Makefile
luci/storage : Makefile
Log message:
ability to specify files for make import with, e.g., make import FILES=file.jpg
Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/cluster/Makefile.diff?cvsroot=cluster&r1=1.2&r2=1.3
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/homebase/Makefile.diff?cvsroot=cluster&r1=1.2&r2=1.3
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/storage/Makefile.diff?cvsroot=cluster&r1=1.2&r2=1.3
--- conga/luci/cluster/Makefile 2006/07/05 17:41:23 1.2
+++ conga/luci/cluster/Makefile 2006/07/14 20:01:40 1.3
@@ -5,7 +5,11 @@
# import page local page templates to the Luci server
import:
- @find . -follow -maxdepth 1 -type f -not -name Makefile -not -name ".*" -print0 | xargs -0 ../load_site.py -u $(LUCI_USER):$(LUCI_PASS) $(LUCI_HTTP)/cluster/
+ @if test $(FILES); then \
+ ../load_site.py -u $(LUCI_USER):$(LUCI_PASS) $(LUCI_HTTP)/cluster/ $(FILES) ; \
+ else \
+ find . -follow -maxdepth 1 -type f -not -name Makefile -not -name ".*" -print0 | xargs -0 ../load_site.py -u $(LUCI_USER):$(LUCI_PASS) $(LUCI_HTTP)/cluster/ ; \
+ fi
export:
@wget -q -r -nH --cut-dirs=2 "ftp://$(LUCI_USER):$(LUCI_PASS)@$(LUCI_FTP)/luci/cluster/*"
--- conga/luci/homebase/Makefile 2006/07/05 17:41:23 1.2
+++ conga/luci/homebase/Makefile 2006/07/14 20:01:40 1.3
@@ -5,7 +5,11 @@
# import page local page templates to the Luci server
import:
- @find . -follow -maxdepth 1 -type f -not -name Makefile -not -name ".*" -print0 | xargs -0 ../load_site.py -u $(LUCI_USER):$(LUCI_PASS) $(LUCI_HTTP)/homebase/
+ @if test $(FILES); then \
+ ../load_site.py -u $(LUCI_USER):$(LUCI_PASS) $(LUCI_HTTP)/homebase/ $(FILES) ; \
+ else \
+ find . -follow -maxdepth 1 -type f -not -name Makefile -not -name ".*" -print0 | xargs -0 ../load_site.py -u $(LUCI_USER):$(LUCI_PASS) $(LUCI_HTTP)/homebase/ ; \
+ fi
export:
@wget -q -r -nH --cut-dirs=2 "ftp://$(LUCI_USER):$(LUCI_PASS)@$(LUCI_FTP)/luci/homebase/*"
--- conga/luci/storage/Makefile 2006/07/05 17:41:23 1.2
+++ conga/luci/storage/Makefile 2006/07/14 20:01:41 1.3
@@ -5,7 +5,11 @@
# import page local page templates to the Luci server
import:
- @find . -follow -maxdepth 1 -type f -not -name Makefile -not -name ".*" -print0 | xargs -0 ../load_site.py -u $(LUCI_USER):$(LUCI_PASS) $(LUCI_HTTP)/storage/
+ @if test $(FILES); then \
+ ../load_site.py -u $(LUCI_USER):$(LUCI_PASS) $(LUCI_HTTP)/storage/ $(FILES) ; \
+ else \
+ find . -follow -maxdepth 1 -type f -not -name Makefile -not -name ".*" -print0 | xargs -0 ../load_site.py -u $(LUCI_USER):$(LUCI_PASS) $(LUCI_HTTP)/storage/ ; \
+ fi
export:
@wget -q -r -nH --cut-dirs=2 "ftp://$(LUCI_USER):$(LUCI_PASS)@$(LUCI_FTP)/luci/storage/*"
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2006-10-05 15:01 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2006-08-16 14:59 [Cluster-devel] conga/luci cluster/Makefile homebase/Makefile rmccabe
-- strict thread matches above, loose matches on Subject: below --
2006-10-05 15:01 kupcevic
2006-07-14 20:08 rmccabe
2006-07-14 20:01 rmccabe
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).