Browse Source

And suddenly my linux box javac needs "-encoding UTF-8", well, cant hurtbeing explicit about that in general.

JNI-119
heck 1 year ago
parent
commit
242bdb073c
19 changed files with 24 additions and 22 deletions
  1. +2
    -0
      Makefile.conf
  2. +5
    -5
      src/Makefile
  3. +1
    -1
      test/java/foundation/pEp/jniadapter/test/basic/Makefile
  4. +1
    -1
      test/java/foundation/pEp/jniadapter/test/jni100/Makefile
  5. +1
    -1
      test/java/foundation/pEp/jniadapter/test/jni111/Makefile
  6. +1
    -1
      test/java/foundation/pEp/jniadapter/test/jni114/Makefile
  7. +1
    -1
      test/java/foundation/pEp/jniadapter/test/jni115/Makefile
  8. +1
    -1
      test/java/foundation/pEp/jniadapter/test/jni88/Makefile
  9. +1
    -1
      test/java/foundation/pEp/jniadapter/test/jni91/Makefile
  10. +1
    -1
      test/java/foundation/pEp/jniadapter/test/jni92/Makefile
  11. +1
    -1
      test/java/foundation/pEp/jniadapter/test/jni94/Makefile
  12. +1
    -1
      test/java/foundation/pEp/jniadapter/test/jni96/Makefile
  13. +1
    -1
      test/java/foundation/pEp/jniadapter/test/jni98/Makefile
  14. +1
    -1
      test/java/foundation/pEp/jniadapter/test/regression/Makefile
  15. +1
    -1
      test/java/foundation/pEp/jniadapter/test/speedtest/Makefile
  16. +1
    -1
      test/java/foundation/pEp/jniadapter/test/templateAlice/Makefile
  17. +1
    -1
      test/java/foundation/pEp/jniadapter/test/templateAliceBob/Makefile
  18. +1
    -1
      test/java/foundation/pEp/jniadapter/test/templateAliceBobCarol/Makefile
  19. +1
    -1
      test/java/foundation/pEp/pitytest/Makefile

+ 2
- 0
Makefile.conf View File

@ -31,6 +31,8 @@ ifeq ($(.SHELLSTATUS),0)
OLD_JAVA=true
endif
JAVAC_CMD=javac -encoding UTF-8
######### Overrides from the config file(s) #########
ifneq ("$(wildcard $(HERE)local.conf)","")
$(info including: $(HERE)local.conf)


+ 5
- 5
src/Makefile View File

@ -81,7 +81,7 @@ GENERATED_CC=\
GENERATED_HH=\
$(CXX_DIR)/throw_pEp_exception.hh
# Generated JNI headers (javac -h)
# Generated JNI headers
JNI_GENERATED_HH=\
$(CXX_DIR)/foundation_pEp_jniadapter_AbstractEngine.h \
$(CXX_DIR)/foundation_pEp_jniadapter__Blob.h \
@ -128,9 +128,9 @@ $(LIB_CXX_STATIC): compile-cxx
# -------------- Compile -----------------
compile-java: create-dirs codegen
cd $(JAVA_DIR);$(JAVA_BIN_DIR)/javac -d ../$(JAVA_BUILD_ROOT) $(JAVA_PKG_BASENAME)/*.java
cd $(JAVA_DIR);$(JAVA_BIN_DIR)/javac -d ../$(JAVA_BUILD_ROOT) $(JAVA_PKG_BASENAME)/exceptions/*.java
cd $(JAVA_DIR);$(JAVA_BIN_DIR)/javac -d ../$(JAVA_BUILD_ROOT) $(JAVA_PKG_BASENAME)/interfaces/*.java
cd $(JAVA_DIR);$(JAVA_BIN_DIR)/$(JAVAC_CMD) -d ../$(JAVA_BUILD_ROOT) $(JAVA_PKG_BASENAME)/*.java
cd $(JAVA_DIR);$(JAVA_BIN_DIR)/$(JAVAC_CMD) -d ../$(JAVA_BUILD_ROOT) $(JAVA_PKG_BASENAME)/exceptions/*.java
cd $(JAVA_DIR);$(JAVA_BIN_DIR)/$(JAVAC_CMD) -d ../$(JAVA_BUILD_ROOT) $(JAVA_PKG_BASENAME)/interfaces/*.java
compile-cxx: create-dirs gen-jni-headers $(OBJECTS)
@ -146,7 +146,7 @@ $(JNI_GENERATED_HH):
ifdef OLD_JAVA
cd $(JAVA_DIR);$(JAVA_BIN_DIR)/javah -d ../$(JAVA_BUILD_ROOT) $(subst /,.,$(subst .java,,$<))
else
cd $(JAVA_DIR);$(JAVA_BIN_DIR)/javac -d ../$(JAVA_BUILD_ROOT) -h ../$(CXX_DIR)/ $(JAVA_PKG_BASENAME)/*.java
cd $(JAVA_DIR);$(JAVA_BIN_DIR)/$(JAVAC_CMD) -d ../$(JAVA_BUILD_ROOT) -h ../$(CXX_DIR)/ $(JAVA_PKG_BASENAME)/*.java
endif


+ 1
- 1
test/java/foundation/pEp/jniadapter/test/basic/Makefile View File

@ -23,7 +23,7 @@ run: compile clean-pep-home
compile: $(JAVA_CLASSES) pitytest
%.class: %.java
cd $(JAVA_CWD);javac -cp $(CLASSPATH) $(JAVA_PKG_BASEPATH)/$(TEST_UNIT_NAME)/$<
cd $(JAVA_CWD);$(JAVAC_CMD) -cp $(CLASSPATH) $(JAVA_PKG_BASEPATH)/$(TEST_UNIT_NAME)/$<
clean:
rm -f $(JAVA_CLASSES)


+ 1
- 1
test/java/foundation/pEp/jniadapter/test/jni100/Makefile View File

@ -22,7 +22,7 @@ run: compile clean-pep-home
compile: $(JAVA_CLASSES) pitytest
%.class: %.java
cd $(JAVA_CWD);javac -cp $(CLASSPATH) $(JAVA_PKG_BASEPATH)/$(TEST_UNIT_NAME)/$<
cd $(JAVA_CWD);$(JAVAC_CMD) -cp $(CLASSPATH) $(JAVA_PKG_BASEPATH)/$(TEST_UNIT_NAME)/$<
clean:
rm -f $(JAVA_CLASSES)


+ 1
- 1
test/java/foundation/pEp/jniadapter/test/jni111/Makefile View File

@ -22,7 +22,7 @@ alice: compile clean-pep-home-alice
compile: $(JAVA_CLASSES) pitytest
%.class: %.java
cd $(JAVA_CWD);javac -cp $(CLASSPATH) $(JAVA_PKG_BASEPATH)/$(TEST_UNIT_NAME)/$<
cd $(JAVA_CWD);$(JAVAC_CMD) -cp $(CLASSPATH) $(JAVA_PKG_BASEPATH)/$(TEST_UNIT_NAME)/$<
clean:
rm -f $(JAVA_CLASSES)


+ 1
- 1
test/java/foundation/pEp/jniadapter/test/jni114/Makefile View File

@ -22,7 +22,7 @@ alice: compile clean-pep-home-alice
compile: $(JAVA_CLASSES) pitytest
%.class: %.java
cd $(JAVA_CWD);javac -cp $(CLASSPATH) $(JAVA_PKG_BASEPATH)/$(TEST_UNIT_NAME)/$<
cd $(JAVA_CWD);$(JAVAC_CMD) -cp $(CLASSPATH) $(JAVA_PKG_BASEPATH)/$(TEST_UNIT_NAME)/$<
clean:
rm -f $(JAVA_CLASSES)


+ 1
- 1
test/java/foundation/pEp/jniadapter/test/jni115/Makefile View File

@ -22,7 +22,7 @@ alice: compile clean-pep-home-alice
compile: $(JAVA_CLASSES) pitytest
%.class: %.java
cd $(JAVA_CWD);javac -cp $(CLASSPATH) $(JAVA_PKG_BASEPATH)/$(TEST_UNIT_NAME)/$<
cd $(JAVA_CWD);$(JAVAC_CMD) -cp $(CLASSPATH) $(JAVA_PKG_BASEPATH)/$(TEST_UNIT_NAME)/$<
clean:
rm -f $(JAVA_CLASSES)


+ 1
- 1
test/java/foundation/pEp/jniadapter/test/jni88/Makefile View File

@ -20,7 +20,7 @@ run: compile clean-pep-home
compile: $(JAVA_CLASSES) pitytest
%.class: %.java
cd $(JAVA_CWD);javac -cp $(CLASSPATH) $(JAVA_PKG_BASEPATH)/$(TEST_UNIT_NAME)/$<
cd $(JAVA_CWD);$(JAVAC_CMD) -cp $(CLASSPATH) $(JAVA_PKG_BASEPATH)/$(TEST_UNIT_NAME)/$<
clean:
rm -f $(JAVA_CLASSES)


+ 1
- 1
test/java/foundation/pEp/jniadapter/test/jni91/Makefile View File

@ -20,7 +20,7 @@ run: compile clean-pep-home
compile: $(JAVA_CLASSES) pitytest
%.class: %.java
cd $(JAVA_CWD);javac -cp $(CLASSPATH) $(JAVA_PKG_BASEPATH)/$(TEST_UNIT_NAME)/$<
cd $(JAVA_CWD);$(JAVAC_CMD) -cp $(CLASSPATH) $(JAVA_PKG_BASEPATH)/$(TEST_UNIT_NAME)/$<
clean:
rm -f $(JAVA_CLASSES)


+ 1
- 1
test/java/foundation/pEp/jniadapter/test/jni92/Makefile View File

@ -21,7 +21,7 @@ run: compile clean-pep-home
compile: $(JAVA_CLASSES) pitytest
%.class: %.java
cd $(JAVA_CWD);javac -cp $(CLASSPATH) $(JAVA_PKG_BASEPATH)/$(TEST_UNIT_NAME)/$<
cd $(JAVA_CWD);$(JAVAC_CMD) -cp $(CLASSPATH) $(JAVA_PKG_BASEPATH)/$(TEST_UNIT_NAME)/$<
clean:
rm -f $(JAVA_CLASSES)


+ 1
- 1
test/java/foundation/pEp/jniadapter/test/jni94/Makefile View File

@ -20,7 +20,7 @@ run: compile clean-pep-home
compile: $(JAVA_CLASSES) pitytest
%.class: %.java
cd $(JAVA_CWD);javac -cp $(CLASSPATH) $(JAVA_PKG_BASEPATH)/$(TEST_UNIT_NAME)/$<
cd $(JAVA_CWD);$(JAVAC_CMD) -cp $(CLASSPATH) $(JAVA_PKG_BASEPATH)/$(TEST_UNIT_NAME)/$<
clean:
rm -f $(JAVA_CLASSES)


+ 1
- 1
test/java/foundation/pEp/jniadapter/test/jni96/Makefile View File

@ -22,7 +22,7 @@ alice: compile clean-pep-home-alice
compile: $(JAVA_CLASSES) pitytest
%.class: %.java
cd $(JAVA_CWD);javac -cp $(CLASSPATH) $(JAVA_PKG_BASEPATH)/$(TEST_UNIT_NAME)/$<
cd $(JAVA_CWD);$(JAVAC_CMD) -cp $(CLASSPATH) $(JAVA_PKG_BASEPATH)/$(TEST_UNIT_NAME)/$<
clean:
rm -f $(JAVA_CLASSES)


+ 1
- 1
test/java/foundation/pEp/jniadapter/test/jni98/Makefile View File

@ -21,7 +21,7 @@ run: compile clean-pep-home
compile: $(JAVA_CLASSES) pitytest
%.class: %.java
cd $(JAVA_CWD);javac -cp $(CLASSPATH) $(JAVA_PKG_BASEPATH)/$(TEST_UNIT_NAME)/$<
cd $(JAVA_CWD);$(JAVAC_CMD) -cp $(CLASSPATH) $(JAVA_PKG_BASEPATH)/$(TEST_UNIT_NAME)/$<
clean:
rm -f $(JAVA_CLASSES)


+ 1
- 1
test/java/foundation/pEp/jniadapter/test/regression/Makefile View File

@ -21,7 +21,7 @@ run: compile clean-pep-home
compile: $(JAVA_CLASSES) pitytest
%.class: %.java
cd $(JAVA_CWD);javac -cp $(CLASSPATH) $(JAVA_PKG_BASEPATH)/$(TEST_UNIT_NAME)/$<
cd $(JAVA_CWD);$(JAVAC_CMD) -cp $(CLASSPATH) $(JAVA_PKG_BASEPATH)/$(TEST_UNIT_NAME)/$<
clean:
rm -f $(JAVA_CLASSES)


+ 1
- 1
test/java/foundation/pEp/jniadapter/test/speedtest/Makefile View File

@ -23,7 +23,7 @@ alice: compile clean-pep-home-alice
compile: $(JAVA_CLASSES) pitytest
%.class: %.java
cd $(JAVA_CWD);javac -cp $(CLASSPATH) $(JAVA_PKG_BASEPATH)/$(TEST_UNIT_NAME)/$<
cd $(JAVA_CWD);$(JAVAC_CMD) -cp $(CLASSPATH) $(JAVA_PKG_BASEPATH)/$(TEST_UNIT_NAME)/$<
clean:
rm -f $(JAVA_CLASSES)


+ 1
- 1
test/java/foundation/pEp/jniadapter/test/templateAlice/Makefile View File

@ -22,7 +22,7 @@ alice: compile clean-pep-home-alice
compile: $(JAVA_CLASSES) pitytest
%.class: %.java
cd $(JAVA_CWD);javac -cp $(CLASSPATH) $(JAVA_PKG_BASEPATH)/$(TEST_UNIT_NAME)/$<
cd $(JAVA_CWD);$(JAVAC_CMD) -cp $(CLASSPATH) $(JAVA_PKG_BASEPATH)/$(TEST_UNIT_NAME)/$<
clean:
rm -f $(JAVA_CLASSES)


+ 1
- 1
test/java/foundation/pEp/jniadapter/test/templateAliceBob/Makefile View File

@ -29,7 +29,7 @@ bob: compile clean-pep-home-bob
compile: $(JAVA_CLASSES) pitytest
%.class: %.java
cd $(JAVA_CWD);javac -cp $(CLASSPATH) $(JAVA_PKG_BASEPATH)/$(TEST_UNIT_NAME)/$<
cd $(JAVA_CWD);$(JAVAC_CMD) -cp $(CLASSPATH) $(JAVA_PKG_BASEPATH)/$(TEST_UNIT_NAME)/$<
clean:
rm -f $(JAVA_CLASSES)


+ 1
- 1
test/java/foundation/pEp/jniadapter/test/templateAliceBobCarol/Makefile View File

@ -30,7 +30,7 @@ carol: compile clean-pep-home-carol
compile: $(JAVA_CLASSES) pitytest
%.class: %.java
cd $(JAVA_CWD);javac -cp $(CLASSPATH) $(JAVA_PKG_BASEPATH)/$(TEST_UNIT_NAME)/$<
cd $(JAVA_CWD);$(JAVAC_CMD) -cp $(CLASSPATH) $(JAVA_PKG_BASEPATH)/$(TEST_UNIT_NAME)/$<
clean:
rm -f $(JAVA_CLASSES)


+ 1
- 1
test/java/foundation/pEp/pitytest/Makefile View File

@ -14,7 +14,7 @@ all: compile
compile: $(JAVA_CLASSES)
%.class: %.java
cd $(JAVA_CWD);javac -cp $(CLASSPATH) $(JAVA_PKG_BASEPATH)/$(PKGNAME)/$<
cd $(JAVA_CWD);$(JAVAC_CMD) -cp $(CLASSPATH) $(JAVA_PKG_BASEPATH)/$(PKGNAME)/$<
clean:
rm -f $(JAVA_CLASSES)


Loading…
Cancel
Save