Login | Register
My pages Projects Community openCollabNet

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

Project highlights: Architectural Overview

joist
Discussion topic

Hide all messages in topic

All messages in topic

CVS update: joist/java Makefile Makefile.config

Author commitlogger at hocus dot collab dot net
Full name commitlogger at hocus dot collab dot net
Date 2000-03-15 19:00:02 PST
Message User: dlr
  Date: 00/03/15 19:00:02

  Modified: java Makefile Makefile.config
  Log:
  Added checks for JAR and class directory to a new prebuild rule. Added prebuild rule as a dependancy for build rule. Added removal of this directory to clean rule.
  
  Revision Changes Path
  1.3 +6 -4 joist/java/Makefile
  
  Index: Makefile
  ====================​====================​====================​=======
  RCS file: /cvs/joist/java/Makefile,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- Makefile 2000/03/14 23:52:17 1.2
  +++ Makefile 2000/03/16 03:00:01 1.3
  @@ -41,12 +41,13 @@
       org/joist/util \
       org/joist/publish
   
  +prebuild:
  + @if [ ! -d $(JAR_DIR) ]; then mkdir $(JAR_DIR); fi
   
  +build: prebuild
  + @echo "Your CLASSPATH is set to '$(CLASSPATH)'"
  + $(JAVAC) $(JFLAGS) `find . -name "*.java"`;
   
  -build:
  - echo $(CLASSPATH)
  - $(JC) $(JFLAGS) `find . -name "*.java"`;
  -
   #all: build jar install
   
   bji: build jar install
  @@ -77,6 +78,7 @@
       unset javadocDirs
   
   clean:
  + @rm -rf $(JAR_DIR)
       @rm -rf $(API_DIR)
   
   install: props
  
  
  
  1.4 +15 -12 joist/java/Makefile.config
  
  Index: Makefile.config
  ====================​====================​====================​=======
  RCS file: /cvs/joist/java/Make​file.config,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- Makefile.config 2000/03/14 23:48:44 1.3
  +++ Makefile.config 2000/03/16 03:00:01 1.4
  @@ -3,19 +3,22 @@
   # a Unix system.
   #
   
  -# Top level directory for source distribution
  -SRC_DIR=$$HOME/joist/java
  +# The directory where you untarred or did cvs checkout.
  +#WORKING_DIR=$$HOME
  +WORKING_DIR=/src/home/$$USER
   
  +# Top level directory for source distribution
  +SRC_DIR=$(WORKING_​DIR)/joist/java
   
   # Path to JDK 1.1, 1.2, or equivalent.
  -JAVA_DIR=/usr/local/jdk
  -#JAVA_DIR=/usr/loca​l/pkgs/jdk1.2.2
  +#JAVA_DIR=/usr/local/jdk
  +JAVA_DIR=/usr/local​/pkgs/jdk1.2.2
   JAVAC=$(JAVA_DIR)/bin/javac
   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
  +#JAVAC=/usr/bin/jikes
   
   SITE_ROOT=/home/httpd/joist
   INSTALL_DIR=java_jar
  @@ -48,17 +51,17 @@
   #####################
   
   # Place where JAR files are kept.
  -JAVA_LIB=$(JAVA_DIR)/lib
  -#JAVA_LIB=/usr/local/java
  +#JAVA_LIB=$(JAVA_DIR)/lib
  +JAVA_LIB=/usr/local/java
   
   # Archives of classes.
   #A=/home/httpd/class​es/servlet-2.0.jar
  -A=/usr/local/jsdk/lib/jsdk.jar
  -#A=$(JAVA_LIB)/jsdk.jar
  +#A=/usr/local/jsdk/​lib/jsdk.jar
  +A=$(JAVA_LIB)/jsdk.jar
   B=$(JAVA_DIR)/lib/classes.zip
   C=$(JAVA_LIB)/cj.jar
  -D=/home/httpd/joist​/java/conf/webmacro.​jar
  -#D=$(JAVA_LIB)/webmacro.jar
  +#D=/home/httpd/jois​t/java/conf/webmacro​.jar
  +D=$(JAVA_LIB)/webmacro.jar
   E=$(JAVA_LIB)/mail.jar
   F=$(JAVA_LIB)/mysql.jar
   G=/usr/local/gnu.reg​exp-1.0.8/lib/gnu-re​gexp-1.0.8.jar
  @@ -67,7 +70,7 @@
   
   CLASSPATH=$A:$B:$​C:$D:$E:$F:$G:$​H:$I:.:$(JAR_DIR):​$(SRC_DIR)
   
  -JFLAGS= -g -classpath $(CLASSPATH) -d $(JAR_DIR)
  +JFLAGS=-g -classpath $(CLASSPATH) -d $(JAR_DIR)
   
   # If you use jikes with emacs.
   JIKESFLAGS= +E
Messages per page: