Login | Register
My pages Projects Community openCollabNet

Discussions > cvs > CVS update: joist/templates Makefile Makefile.config

Project highlights: Architectural Overview

joist
Discussion topic

Back to topic list

CVS update: joist/templates Makefile Makefile.config

Author commitlogger at hocus dot collab dot net
Full name commitlogger at hocus dot collab dot net
Date 2000-06-07 12:03:57 PDT
Message User: dlr
  Date: 00/06/07 12:03:57

  Modified: templates Makefile Makefile.config
  Log:
  Updated to install successfully into the sandbox.
  
  Revision Changes Path
  1.2 +11 -39 joist/templates/Makefile
  
  Index: Makefile
  ====================​====================​====================​=======
  RCS file: /cvs/joist/templates/Makefile,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- Makefile 2000/06/07 18:36:40 1.1
  +++ Makefile 2000/06/07 19:03:56 1.2
  @@ -1,19 +1,18 @@
  +###################​####################​####################​###########
  +# -*- Makefile -*- developed for a Unix system.
  +#
  +# This cooks the templates if necessary, and copies them into the
  +# installation location.
   #
  -# This cooks the templates if necessary, and copies into the proper
  -# installation location.
  -#
   
   include Makefile.config
   
  -all: cook
  -
   cook: clean
       @mkdir $(COOKED_DIR); \
  - perl $(SANDBOX)/scripts/​template-cooker;
  - editsx -c "s,SITE_ROOT,$(SITE​_TEMPLATE_BRAND)," '*.wm' "$(COOKED_DIR)"; \
  - opersx '$(SANDBOX)/scripts/link-cooker *.wm' "$(COOKED_DIR)";
  -# cp -r $(RAW_DIR) $(COOKED_DIR)/; \
  -# find $(RAW_DIR) -name '*.wm' | cpio -adump $(COOKED_DIR)
  + perl $(SANDBOX)/scripts/​template-cooker; \
  + editsx -c 's,SITE_ROOT,$(INSTALL_DIR),' '*.wm' \
  + '$(COOKED_DIR)'; \
  + opersx '$(SANDBOX)/scripts/link-cooker *.wm' '$(COOKED_DIR)'
   
   clean:
       - rm -rf $(COOKED_DIR)
  @@ -24,33 +23,6 @@
         echo 'Copying cooked templates'; \
       else \
         echo 'Copying uncooked templates'; \
  - fi; \
  - ls -ld $(SITE_TEMPLATE_DIR); \
  - if [ ! -d $(SITE_TEMPLATE_DIR) ]; then \
  - echo ">> creating $(SITE_TEMPLATE_DIR)"; \
  - mkdir $(SITE_TEMPLATE_DIR); \
  - fi; \
  - ls -ld $(SITE_TEMPLATE_BRAND); \
  - if [ ! -d $(SITE_TEMPLATE_BRAND) ]; then \
  - echo ">> creating $(SITE_TEMPLATE_BRAND)"; \
  - mkdir $(SITE_TEMPLATE_BRAND); \
       fi; \
  - ls -ld $(SITE_TEMPLATE_BRA​ND)/$(RAW_DIR); \
  - if [ ! -d $(SITE_TEMPLATE_BRA​ND)/$(RAW_DIR) ]; then \
  - echo ">> creating $(SITE_TEMPLATE_BRA​ND)/$(RAW_DIR)"; \
  - mkdir $(SITE_TEMPLATE_BRA​ND)/$(RAW_DIR); \
  - fi; \
  - rsync -ar --delete $(RAW_DIR)/$(PRODUCT)/* $(INSTALL_DIR)
  -# rsync -ar --delete $(RAW_DIR)/ $(INSTALL_DIR)
  -# rsync -ar --delete $(RAW_DIR)/$(PRODUCT) $(INSTALL_DIR)
  -
  -# ls -ld $(INSTALL_DIR); \
  -# if [ ! -d $(INSTALL_DIR) ]; then \
  -# echo ">> creating $(INSTALL_DIR)"; \
  -# mkdir $(INSTALL_DIR); \
  -# fi; \
  -# rsync -ar --delete $(RAW_DIR)/$(PRODUCT) $(INSTALL_DIR)
  -
  -
  -# rm -rf $(INSTALL_DIR)/org/$(PROJECT); \
  -# find . -name '*.wm' | cpio -adump $(INSTALL_DIR)
  + mkdir -p --verbose $(INSTALL_DIR); \
  + rsync -ar --delete $(RAW_DIR)/$(PROJECT)/ $(INSTALL_DIR)
  
  
  
  1.2 +3 -5 joist/templates/Makefile.config
  
  Index: Makefile.config
  ====================​====================​====================​=======
  RCS file: /cvs/joist/templates​/Makefile.config,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- Makefile.config 2000/06/07 18:36:40 1.1
  +++ Makefile.config 2000/06/07 19:03:56 1.2
  @@ -2,13 +2,11 @@
   # -*- Makefile -*- config file developed for a Unix system.
   #
   
  -SITE_ROOT=$(SANDBOX)/site
  -INSTALL_DIR=$(SITE​_ROOT)/templates/$(​BRAND)
   PROJECT=joist
  +SITE_ROOT=$(SANDBOX)/site
   TEMPLATE_DIR=$(SAND​BOX)/$(PROJECT)/tem​plates
  -RAW_DIR=./org
  +RAW_DIR=org
   COOKED_DIR=$(TEMPLA​TE_DIR)/cooked
   SITE_TEMPLATE_DIR=$​(SITE_ROOT)/template​s
   SITE_TEMPLATE_BRAND=​$(SITE_TEMPLATE_DIR​)/$(BRAND)
  -INSTALL_DIR=$(SITE​_TEMPLATE_BRAND)/$(​RAW_DIR)
  -#INSTALL_DIR=$(SIT​E_TEMPLATE_BRAND)/$​(RAW_DIR)/$(PROJECT​)
  +INSTALL_DIR=$(SITE​_TEMPLATE_BRAND)/$(​RAW_DIR)/$(PROJECT)​

« Previous message in topic | 1 of 1 | Next message in topic »

Messages

Show all messages in topic

CVS update: joist/templates Makefile Makefile.config commitlogger at hocus dot collab dot net commitlogger at hocus dot collab dot net 2000-06-07 12:03:57 PDT
Messages per page: