Changeset 28370

Show
Ignore:
Timestamp:
10.10.2013 00:28:10 (6 years ago)
Author:
davidb
Message:

Changes that help using javac in Make fiels when compiling up Greenstone with Cygwin on Windows

Location:
main/trunk/greenstone2/common-src
Files:
3 modified

Legend:

Unmodified
Added
Removed
  • main/trunk/greenstone2/common-src/indexers/lucene-gs/Makefile.in

    r27330 r28370  
    2121# source and target to 1.4, only Lucene 3.x needsd version 1.5 or higher 
    2222classes3/org/greenstone/LuceneWrapper3/%.class: src/org/greenstone/LuceneWrapper3/%.java 
     23ifeq ($(GSDLOS),windows) 
     24    mkdir -p classes3 && $(JAVAC) -classpath "$(LUCENE3_JAR);classes3;." -d classes3 -sourcepath src/ src/org/greenstone/LuceneWrapper3/$*.java 
     25else 
    2326    mkdir -p classes3 && $(JAVAC) -classpath $(LUCENE3_JAR):classes3:. -d classes3 -sourcepath src/ src/org/greenstone/LuceneWrapper3/$*.java 
     27endif 
    2428 
    2529LuceneWrapper3.jar: $(LUCENE3_WRAPPER_OBJECTS) 
  • main/trunk/greenstone2/common-src/indexers/mgpp/java/org/greenstone/mgpp/Makefile.in

    r25147 r28370  
    3434JAVASRCDIR=../../.. 
    3535JAVACOPTIONS= -deprecation -g -O 
    36 JAVACLASSPATH=$(JAVACLASSDIR): 
     36ifeq ($(GSDLOS),windows) 
     37JAVACLASSPATH=$(JAVACLASSDIR);. 
     38else 
     39JAVACLASSPATH=$(JAVACLASSDIR):. 
     40endif 
    3741 
    3842datadir = $(prefix)/share 
  • main/trunk/greenstone2/common-src/src/jdbmedit/Makefile.in

    r23356 r28370  
    2121 
    2222%.class: %.java 
     23ifeq ($(GSDLOS), "windows") 
     24# for cygwin with a native Windows java compiler 
     25    $(JAVAC) $(JAVACFLAGS) -classpath "$(JDBM_JAR);." $< 
     26else 
    2327    $(JAVAC) $(JAVACFLAGS) -classpath $(JDBM_JAR):. $< 
    24  
     28endif 
    2529 
    2630clean: