From 6b3ceaf4b5d230dd0bf92b97b51152118a4a7717 Mon Sep 17 00:00:00 2001
From: henry <Henry Weller h.weller@opencfd.co.uk>
Date: Fri, 17 Jul 2009 09:30:36 +0100
Subject: [PATCH] Removed support for Java.

---
 wmake/rules/General/java         | 10 ----------
 wmake/rules/General/javaDebug    |  2 --
 wmake/rules/General/javaOpt      |  2 --
 wmake/rules/General/sourceToDep  |  5 +----
 wmake/rules/General/standard     |  1 -
 wmake/rules/linuxmingw32/general |  3 +--
 wmake/scripts/addCompile         | 31 +++++++------------------------
 7 files changed, 9 insertions(+), 45 deletions(-)
 delete mode 100644 wmake/rules/General/java
 delete mode 100644 wmake/rules/General/javaDebug
 delete mode 100644 wmake/rules/General/javaOpt

diff --git a/wmake/rules/General/java b/wmake/rules/General/java
deleted file mode 100644
index 4f5db4ce84..0000000000
--- a/wmake/rules/General/java
+++ /dev/null
@@ -1,10 +0,0 @@
-.SUFFIXES: .java .class
-
-javac       = javac
-
-include $(GENERAL_RULES)/java$(WM_JAVAC_OPTION)
-
-javaFLAGS   = -classpath $(CLASS_PATH):$(CLASSES_DIR):. $(EXE_INC) $(javaOPT) $(javaDBUG) -d $(CLASSES_DIR) -deprecation
-
-javatoclass = mkdir -p $(CLASSES_DIR) ; \
-    ( $(javac) $(javaFLAGS) $$SOURCE || ( rm -f $@ ) )
diff --git a/wmake/rules/General/javaDebug b/wmake/rules/General/javaDebug
deleted file mode 100644
index cfa90e60c2..0000000000
--- a/wmake/rules/General/javaDebug
+++ /dev/null
@@ -1,2 +0,0 @@
-javaDBUG     = -g
-javaOPT      = 
diff --git a/wmake/rules/General/javaOpt b/wmake/rules/General/javaOpt
deleted file mode 100644
index 9acdaa7d46..0000000000
--- a/wmake/rules/General/javaOpt
+++ /dev/null
@@ -1,2 +0,0 @@
-javaDBUG     = 
-javaOPT      = -O
diff --git a/wmake/rules/General/sourceToDep b/wmake/rules/General/sourceToDep
index 9935761405..f98c8f8cf4 100644
--- a/wmake/rules/General/sourceToDep
+++ b/wmake/rules/General/sourceToDep
@@ -1,4 +1,4 @@
-.SUFFIXES: .c .cc .cxx .cpp .C .java .F .f .dep
+.SUFFIXES: .c .cc .cxx .cpp .C .F .f .dep
 
 MKDEP       = $(UTILBIN)/wmkdep -I$(*D) $(LIB_HEADER_DIRS)
 
@@ -17,9 +17,6 @@ MKDEP       = $(UTILBIN)/wmkdep -I$(*D) $(LIB_HEADER_DIRS)
 .C.dep:
 	$(MAKE_DEP)
 
-.java.dep:
-	$(MAKE_DEP)
-
 .F.dep:
 	$(MAKE_DEP)
 
diff --git a/wmake/rules/General/standard b/wmake/rules/General/standard
index 7752bef084..cf698d1e1e 100644
--- a/wmake/rules/General/standard
+++ b/wmake/rules/General/standard
@@ -2,7 +2,6 @@ include $(GENERAL_RULES)/version
 
 include $(GENERAL_RULES)/sourceToDep
 
-include $(GENERAL_RULES)/java
 include $(GENERAL_RULES)/flex
 include $(GENERAL_RULES)/flex++
 #include $(GENERAL_RULES)/byacc
diff --git a/wmake/rules/linuxmingw32/general b/wmake/rules/linuxmingw32/general
index 27ccb3c9db..6a37beabd4 100644
--- a/wmake/rules/linuxmingw32/general
+++ b/wmake/rules/linuxmingw32/general
@@ -7,7 +7,6 @@ include $(RULES)/X
 
 include $(GENERAL_RULES)/sourceToDep
 
-include $(GENERAL_RULES)/java
 include $(GENERAL_RULES)/flex
 include $(GENERAL_RULES)/flex++
 include $(GENERAL_RULES)/byacc
@@ -20,6 +19,6 @@ include $(RULES)/c++
 SO      = dll
 EXE_EXT = .exe
 
-# Ensure we know what OS we are compiling for 
+# Ensure we know what OS we are compiling for
 # during MakefileFiles and MakefileOptions
 GFLAGS  += -DWIN32 -DLITTLE_ENDIAN
diff --git a/wmake/scripts/addCompile b/wmake/scripts/addCompile
index 802768241b..1e75e7eae1 100755
--- a/wmake/scripts/addCompile
+++ b/wmake/scripts/addCompile
@@ -53,30 +53,13 @@ else
     cat > $depName
 fi
 
+sed -e s%".*.o.*:"%'$(OBJECTS_DIR)/'"$objectName\:"%  \
+    -e s%$WM_PROJECT_DIR%'$(WM_PROJECT_DIR)'%         \
+    >> $depName
 
-if [ "$sub" = java ]
-then
-
-    sed -e s%"\(.*\).class.*:"%'$(CLASSES_DIR)/'"\1.class\:"%   \
-        -e s%$WM_PROJECT_DIR%'$(WM_PROJECT_DIR)'%               \
-        >> $depName
-
-    echo '$(CLASSES_DIR)/'$sourceDir/$className': $(EXE_DEP)' >> $depName
-    echo '$(CLASSES_DIR)/'$sourceDir/$className':' >> $depName
-    echo '	@SOURCE_DIR='$sourceDir '\' >> $depName
-    echo '	SOURCE='$1' ; $('$sub'toclass)' >> $depName
-
-else
-
-    sed -e s%".*.o.*:"%'$(OBJECTS_DIR)/'"$objectName\:"%  \
-        -e s%$WM_PROJECT_DIR%'$(WM_PROJECT_DIR)'%         \
-        >> $depName
-
-    echo '$(OBJECTS_DIR)/'$objectName': $(EXE_DEP)' >> $depName
-    echo '$(OBJECTS_DIR)/'$objectName':' >> $depName
-    echo '	@SOURCE_DIR='$sourceDir >> $depName
-    echo '	SOURCE='$1' ; $('$sub'too)' >> $depName
-
-fi
+echo '$(OBJECTS_DIR)/'$objectName': $(EXE_DEP)' >> $depName
+echo '$(OBJECTS_DIR)/'$objectName':' >> $depName
+echo '	@SOURCE_DIR='$sourceDir >> $depName
+echo '	SOURCE='$1' ; $('$sub'too)' >> $depName
 
 #------------------------------------------------------------------------------