Login | Register
My pages Projects Community openCollabNet

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

Project highlights: Architectural Overview

joist
Discussion topic

Back to topic list

CVS update: joist/noload Makefile.config

Author commitlogger at hocus dot collab dot net
Full name commitlogger at hocus dot collab dot net
Date 2000-04-05 21:52:46 PDT
Message User: manoj
  Date: 00/04/05 21:52:46

  Modified: java Makefile Makefile.config
               noload Makefile.config
  Log:
  Changes to joist to support per-developer sandboxes.
  
  Revision Changes Path
  1.7 +4 -3 joist/java/Makefile
  
  Index: Makefile
  ====================​====================​====================​=======
  RCS file: /cvs/joist/java/Makefile,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- Makefile 2000/04/03 00:39:34 1.6
  +++ Makefile 2000/04/06 04:52:46 1.7
  @@ -38,6 +38,7 @@
       org/joist/session \
       org/joist/sql \
       org/joist/util \
  + org/joist/help \
       org/joist/publish
   
   prebuild:
  @@ -80,14 +81,14 @@
       @rm -rf $(JAR_DIR)
       @rm -rf $(API_DIR)
   
  -install: props
  +install: build props jar
       cp $(JAR_DIR)/$(JAR_FILE) $(SITE_ROOT)/$(INSTALL_DIR); \
       chmod 770 $(SITE_ROOT)/$(INS​TALL_DIR)/$(JAR_FIL​E);
   
   props:
       find . -name "*.properties" | cpio -pudma $(SITE_ROOT)/$(INSTALL_DIR);
  - chown -R nobody:nobody $(SITE_ROOT)/$(INS​TALL_DIR)/org; \
  - chmod -R 770 $(SITE_ROOT)/$(INS​TALL_DIR)/org;
  + chown -R nobody:nobody $(SITE_ROOT)/$(INS​TALL_DIR)/org; || true\
  + chmod -R 770 $(SITE_ROOT)/$(INSTALL_DIR)/org || true;
   
   yin:
       sudo rsync -va -e ssh --delete $(SITE_ROOT)/$(INSTALL_DIR) \
  
  
  
  1.5 +7 -5 joist/java/Makefile.config
  
  Index: Makefile.config
  ====================​====================​====================​=======
  RCS file: /cvs/joist/java/Make​file.config,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- Makefile.config 2000/03/16 03:00:01 1.4
  +++ Makefile.config 2000/04/06 04:52:46 1.5
  @@ -4,23 +4,24 @@
   #
   
   # The directory where you untarred or did cvs checkout.
  -#WORKING_DIR=$$HOME
  -WORKING_DIR=/src/home/$$USER
  +WORKING_DIR=$(SANDBOX)
  +#WORKING_DIR=/home/$(USER)
   
   # Top level directory for source distribution
   SRC_DIR=$(WORKING_D​IR)/joist/java
   
   # Path to JDK 1.1, 1.2, or equivalent.
   #JAVA_DIR=/usr/local/jdk
  -JAVA_DIR=/usr/local​/pkgs/jdk1.2.2
  -JAVAC=$(JAVA_DIR)/bin/javac
  +JAVA_DIR=/usr/local/pkgs/jdk
  +#JAVAC=$(JAVA_DIR)/bin/javac
  +JAVAC=/usr/local/pk​gs/jikes/jikes
   JAVA_AR=$(JAVA_DIR)/bin/jar
   JAVADOC=$(JAVA_DIR)/bin/javadoc
   
   # If you use jikes (from http://www.alphaworks.ibm.com), use this JAVAC line.
   #JAVAC=/usr/bin/jikes
   
  -SITE_ROOT=/home/httpd/joist
  +SITE_ROOT=$(SANDBOX)/joist
   INSTALL_DIR=java_jar
   JAR_FILE=joist.jar
   
  @@ -74,6 +75,7 @@
   
   # If you use jikes with emacs.
   JIKESFLAGS= +E
  +
   
   .SUFFIXES: .java .class
   
  
  
  
  1.2 +3 -3 joist/noload/Makefile.config
  
  Index: Makefile.config
  ====================​====================​====================​=======
  RCS file: /cvs/joist/noload/Ma​kefile.config,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- Makefile.config 2000/01/24 02:05:43 1.1
  +++ Makefile.config 2000/04/06 04:52:46 1.2
  @@ -6,7 +6,7 @@
   
   
   # Top level directory for source distribution
  -SRC_DIR=/home/httpd​/joist/noload
  +SRC_DIR=$(SANDBOX)​/joist/noload
   
   
   # Path to JDK 1.1 or JDK 1.2 or equivalent
  @@ -16,7 +16,7 @@
   JAVADOC=$(JAVA_DIR)/bin/javadoc
   
   # if you have jikes (from www.alphaworks.ibm.com)
  -JAVAC=/usr/bin/jikes
  +JAVAC=/usr/local/pk​gs/jikes/jikes
   
   JAR_FILE = noload.jar
   
  @@ -53,7 +53,7 @@
   A=/usr/local/jsdk/lib/jsdk.jar
   B=$(JAVA_DIR)/lib/classes.zip
   C=$(JAVA_DIR)/lib/cj.jar
  -D=/home/httpd/tigri​s/java/conf/webmacro​.jar
  +D=$(SANDBOX)/conf/webmacro.jar
   E=$(JAVA_DIR)/lib/mail.jar
   F=$(JAVA_DIR)/lib/mysql.jar
   H=$(JAVA_DIR)/lib/village.jar

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

Messages

Show all messages in topic

CVS update: joist/noload Makefile.config commitlogger at hocus dot collab dot net commitlogger at hocus dot collab dot net 2000-04-05 21:52:46 PDT
Messages per page: