* [Cluster-devel] conga/luci Makefile cluster/Makefile homebase/ ...
@ 2006-06-30 18:42 rmccabe
0 siblings, 0 replies; 2+ messages in thread
From: rmccabe @ 2006-06-30 18:42 UTC (permalink / raw)
To: cluster-devel.redhat.com
CVSROOT: /cvs/cluster
Module name: conga
Changes by: rmccabe at sourceware.org 2006-06-30 18:42:17
Modified files:
luci : Makefile
Added files:
luci/cluster : Makefile
luci/homebase : Makefile
luci/storage : Makefile
Log message:
rework makefiles for import/export
Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/Makefile.diff?cvsroot=cluster&r1=1.7&r2=1.8
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/cluster/Makefile.diff?cvsroot=cluster&r1=NONE&r2=1.1
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/homebase/Makefile.diff?cvsroot=cluster&r1=NONE&r2=1.1
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/storage/Makefile.diff?cvsroot=cluster&r1=NONE&r2=1.1
--- conga/luci/Makefile 2006/06/30 17:45:20 1.7
+++ conga/luci/Makefile 2006/06/30 18:42:16 1.8
@@ -1,9 +1,9 @@
-# $Id: Makefile,v 1.7 2006/06/30 17:45:20 rmccabe Exp $
+# $Id: Makefile,v 1.8 2006/06/30 18:42:16 rmccabe Exp $
+ZOPEINSTANCE=/var/lib/luci
all: luci
-
luci:
make -C site
make -C utils
@@ -38,60 +38,32 @@
make -C sysconfig distclean
make -C docs distclean
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-PT_DIR=pts
-ZOPEUSER=admin
-ZOPEPASS=changeme
-ZOPEINSTANCE=/var/lib/luci
-PLONEINSTANCE=luci
-DBFILE=Data.fs
-ZOPEFTP=localhost:8021
-ZOPEHTTP=http://localhost:25639/
-ZOPEDIRS=cluster storage homebase
-HBDIR=homebase
-CLUSTERDIR=cluster
-STORAGEDIR=storage
-
all_old: tar
tar:
-# import page local page templates to the Luci server
-
import_storage:
- @find $(STORAGEDIR) -follow -maxdepth 1 -type f -print0 | xargs -0 ./load_site.py http://localhost:25639/luci/storage/
+ make -C storage import
+
+export_storage:
+ make -C storage export
import_cluster:
- @find $(CLUSTERDIR) -follow -maxdepth 1 -type f -print0 | xargs -0 ./load_site.py http://localhost:25639/luci/cluster/
+ make -C cluster import
-import_homebase:
- @find $(HBDIR) -follow -maxdepth 1 -type f -print0 | xargs -0 ./load_site.py http://localhost:25639/luci/homebase/
+export_cluster:
+ make -C cluster export
-import_pts: import_storage import_cluster import_homebase
+import_homebase:
+ make -C homebase import
-pt_dir:
- @mkdir pts >& /dev/null
+export_homebase:
+ make -C homebase export
-# export page templates from the Luci server
-export_pts: pt_dir
- @pwd=`pwd` ; cd $(PT_DIR) && \
- ( for i in $(ZOPEDIRS) ; do wget -q -r -nH --cut-dirs=1 "ftp://$(ZOPEUSER):$(ZOPEPASS)@$(ZOPEFTP)/$(PLONEINSTANCE)/$$i/*" ; done) ; cd $$pwd
+import_pts: import_storage import_cluster import_homebase
+export_pts: export_storage export_cluster export_homebase
pack:
- @./pack.py $(ZOPEINSTANCE)/var/Data.fs
+ @./pack.py $(ZOPEINSTANCE)/var/Data.fs && chown luci: $(ZOPEINSTANCE)/var/Data.fs
cert:
/cvs/cluster/conga/luci/cluster/Makefile,v --> standard output
revision 1.1
--- conga/luci/cluster/Makefile
+++ - 2006-06-30 18:42:17.544285000 +0000
@@ -0,0 +1,11 @@
+LUCI_USER=admin
+LUCI_PASS=changeme
+LUCI_FTP=localhost:8021
+LUCI_HTTP=http://localhost:25639/luci
+
+# 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/
+
+export:
+ @wget -q -r -nH --cut-dirs=2 "ftp://$(LUCI_USER):$(LUCI_PASS)@$(LUCI_FTP)/luci/cluster/*"
/cvs/cluster/conga/luci/homebase/Makefile,v --> standard output
revision 1.1
--- conga/luci/homebase/Makefile
+++ - 2006-06-30 18:42:17.634327000 +0000
@@ -0,0 +1,11 @@
+LUCI_USER=admin
+LUCI_PASS=changeme
+LUCI_FTP=localhost:8021
+LUCI_HTTP=http://localhost:25639/luci
+
+# 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/
+
+export:
+ @wget -q -r -nH --cut-dirs=2 "ftp://$(LUCI_USER):$(LUCI_PASS)@$(LUCI_FTP)/luci/homebase/*"
/cvs/cluster/conga/luci/storage/Makefile,v --> standard output
revision 1.1
--- conga/luci/storage/Makefile
+++ - 2006-06-30 18:42:17.714130000 +0000
@@ -0,0 +1,11 @@
+LUCI_USER=admin
+LUCI_PASS=changeme
+LUCI_FTP=localhost:8021
+LUCI_HTTP=http://localhost:25639/luci
+
+# 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/
+
+export:
+ @wget -q -r -nH --cut-dirs=2 "ftp://$(LUCI_USER):$(LUCI_PASS)@$(LUCI_FTP)/luci/storage/*"
^ permalink raw reply [flat|nested] 2+ messages in thread
* [Cluster-devel] conga/luci Makefile cluster/Makefile homebase/ ...
@ 2006-07-05 17:41 rmccabe
0 siblings, 0 replies; 2+ messages in thread
From: rmccabe @ 2006-07-05 17:41 UTC (permalink / raw)
To: cluster-devel.redhat.com
CVSROOT: /cvs/cluster
Module name: conga
Changes by: rmccabe at sourceware.org 2006-07-05 17:41:24
Modified files:
luci : Makefile
luci/cluster : Makefile
luci/homebase : Makefile
luci/storage : Makefile
Log message:
makefile tweaks
Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/Makefile.diff?cvsroot=cluster&r1=1.8&r2=1.9
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/cluster/Makefile.diff?cvsroot=cluster&r1=1.1&r2=1.2
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/homebase/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.1&r2=1.2
--- conga/luci/Makefile 2006/06/30 18:42:16 1.8
+++ conga/luci/Makefile 2006/07/05 17:41:22 1.9
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.8 2006/06/30 18:42:16 rmccabe Exp $
+# $Id: Makefile,v 1.9 2006/07/05 17:41:22 rmccabe Exp $
ZOPEINSTANCE=/var/lib/luci
@@ -46,19 +46,19 @@
make -C storage import
export_storage:
- make -C storage export
+ make -C -e storage export
import_cluster:
- make -C cluster import
+ make -C -e cluster import
export_cluster:
- make -C cluster export
+ make -C -e cluster export
import_homebase:
- make -C homebase import
+ make -C -e homebase import
export_homebase:
- make -C homebase export
+ make -C -e homebase export
import_pts: import_storage import_cluster import_homebase
export_pts: export_storage export_cluster export_homebase
--- conga/luci/cluster/Makefile 2006/06/30 18:42:16 1.1
+++ conga/luci/cluster/Makefile 2006/07/05 17:41:23 1.2
@@ -1,7 +1,7 @@
LUCI_USER=admin
LUCI_PASS=changeme
-LUCI_FTP=localhost:8021
-LUCI_HTTP=http://localhost:25639/luci
+LUCI_FTP=luci:8021
+LUCI_HTTP=http://luci:8080/luci
# import page local page templates to the Luci server
import:
--- conga/luci/homebase/Makefile 2006/06/30 18:42:17 1.1
+++ conga/luci/homebase/Makefile 2006/07/05 17:41:23 1.2
@@ -1,7 +1,7 @@
LUCI_USER=admin
LUCI_PASS=changeme
-LUCI_FTP=localhost:8021
-LUCI_HTTP=http://localhost:25639/luci
+LUCI_FTP=luci:8021
+LUCI_HTTP=http://luci:8080/luci
# import page local page templates to the Luci server
import:
--- conga/luci/storage/Makefile 2006/06/30 18:42:17 1.1
+++ conga/luci/storage/Makefile 2006/07/05 17:41:23 1.2
@@ -1,7 +1,7 @@
LUCI_USER=admin
LUCI_PASS=changeme
-LUCI_FTP=localhost:8021
-LUCI_HTTP=http://localhost:25639/luci
+LUCI_FTP=luci:8021
+LUCI_HTTP=http://luci:8080/luci
# import page local page templates to the Luci server
import:
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2006-07-05 17:41 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2006-07-05 17:41 [Cluster-devel] conga/luci Makefile cluster/Makefile homebase/ rmccabe
-- strict thread matches above, loose matches on Subject: below --
2006-06-30 18:42 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).