Login | Register
My pages Projects Community openCollabNet

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

Project highlights: Architectural Overview

joist
Discussion topic

Back to topic list

CVS update: joist/java Makefile Makefile.config

Author stack
Full name Michael Stack
Date 2000-09-21 15:41:45 PDT
Message User: stack
  Date: 00/09/21 15:41:45

  Modified: java Makefile Makefile.config
  Log:
  Put back DLR tests for first time install that were lost in the otnxchange release of 09/15/2000. DLR test for first time install. In this case there is no 'site' dir. The java compile was complaining about the missing dir as its stuck on the front of the classpath.
  
  Revision Changes Path
  1.20 +6 -2 joist/java/Makefile
  
  Index: Makefile
  ====================​====================​====================​=======
  RCS file: /cvs/joist/java/Makefile,v
  retrieving revision 1.19
  retrieving revision 1.20
  diff -u -r1.19 -r1.20
  --- Makefile 2000/09/18 19:18:09 1.19
  +++ Makefile 2000/09/21 22:41:45 1.20
  @@ -1,7 +1,7 @@
   ####################​####################​####################​##########
   # -*- Makefile -*- developed for a Unix system.
   #
  -# $Id: Makefile,v 1.19 2000/09/18 19:18:09 davidp Exp $
  +# $Id: Makefile,v 1.20 2000/09/21 22:41:45 stack Exp $
   #
   #
   ####################​####################​####
  @@ -16,7 +16,11 @@
   include Makefile.config
   
   build: dest
  - find org -name '*.java' | xargs $(JAVAC) $(JFLAGS) $(JIKESFLAGS)
  + @if [ -d $(INSTALL_DIR) ]; then \
  + find . -name '*.java' | xargs $(JAVAC) $(JFLAGS) $(JIKESFLAGS); \
  + else \
  + find . -name '*.java' | xargs $(JAVAC) $(INITIAL_JFLAGS); \
  + fi
   
   jar: makefiles build props
       @cd $(CLASS_DIR); \
  
  
  
  1.16 +3 -1 joist/java/Makefile.config
  
  Index: Makefile.config
  ====================​====================​====================​=======
  RCS file: /cvs/joist/java/Make​file.config,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- Makefile.config 2000/09/18 19:19:57 1.15
  +++ Makefile.config 2000/09/21 22:41:45 1.16
  @@ -1,7 +1,7 @@
   ####################​####################​####################​##########
   # -*- Makefile -*- config file developed for a Unix system.
   #
  -# $Id: Makefile.config,v 1.15 2000/09/18 19:19:57 davidp Exp $
  +# $Id: Makefile.config,v 1.16 2000/09/21 22:41:45 stack Exp $
   #
   # This file is included by the adjacent Makefile.
   # Add customizations in this file. Leave the
  @@ -57,6 +57,8 @@
   
   # Java compiler flags. Note that the site class files will overshadow your
   # system classes.
  +#
  +INITIAL_JFLAGS=-g -classpath $(CLASSPATH) -d $(CLASS_DIR)
   JFLAGS=-g -classpath $(SITE_ROOT)/java:$(CLASSPATH) -d $(CLASS_DIR)

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

Messages

Show all messages in topic

CVS update: joist/java Makefile Makefile.config stack Michael Stack 2000-09-21 15:41:45 PDT
Messages per page: