Skip to content

Commit cfe7398

Browse files
committed
Moved all java code to branch 'legacy'
Current implementation of java network_viewer module has been specified as deprecated
1 parent 68b75b9 commit cfe7398

16 files changed

+1
-3594
lines changed

Makefile.in

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -58,9 +58,6 @@ network_viewer_qt_v2:
5858
clustering:
5959
$(MAKE) -C ./src/clustering
6060

61-
java:
62-
$(MAKE) -C ./src/java
63-
6461
clean: clean_core
6562
$(foreach rule, $(GOALS), $(MAKE) clean -C ./src/$(rule);)
6663

@@ -72,5 +69,3 @@ prepare_install:
7269

7370
$(INSTALL_DIR)/config:
7471
cp config $(INSTALL_DIR)/config
75-
76-
.PHONY: src/java

configure.ac

Lines changed: 1 addition & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,6 @@ AC_DEFUN([AX_CHECK_PROG],
2828
]
2929
)
3030

31-
AC_ARG_VAR([JAVAC], [Place where javac is installed])
32-
AC_ARG_VAR([JAR], [Place where jar is installed])
33-
AC_ARG_VAR([ANT], [Place where ant utility is installed])
3431
# TODO: Change the value for qmake for QT5 later
3532
AC_ARG_VAR([QMAKE], [Place where qmake-qt4 is installed])
3633
AC_ARG_VAR([MPICC], [Path to MPI2 compatible C-compiler])
@@ -41,9 +38,6 @@ AC_ARG_VAR([MPI_LIBS], [Additional libs for parallel program])
4138
AC_ARG_VAR([MPI_LDFLAGS], [Path to additional libs for parallel program])
4239
AC_ARG_VAR([GOALS], [List of goals to be built])
4340

44-
AX_ARG_ENABLE([java-gui], [" java "], [""],
45-
[Enable Java version of network-viewer program (disabled by default)]
46-
) # java
4741
AX_ARG_ENABLE([qt-gui], [" network_viewer_qt_v2 "], [""],
4842
[Enable Qt version of network-viewer program (disabled by default)]
4943
) # network_viewer_qt_v2
@@ -57,17 +51,14 @@ AX_ARG_ENABLE([clustering], [" clustering "], [""],
5751
AC_ARG_ENABLE([all],
5852
[AS_HELP_STRING([--enable-all], [Enable all modules])],
5953
[AS_CASE(["${enableval}"],
60-
[yes], [AC_SUBST([GOALS], ["java network_test network_viewer_qt_v2 clustering"])],
54+
[yes], [AC_SUBST([GOALS], ["network_test network_viewer_qt_v2 clustering"])],
6155
[no], [],
6256
[AC_MSG_ERROR([Bad value ${enableval} for --enable-all])]
6357
)
6458
]
6559
# nothing to do because feature is disabled by default
6660
) # all
6761

68-
AS_IF([test "x$JAVAC" = "x"], [AC_SUBST([JAVAC], [javac])])
69-
AS_IF([test "x$JAR" = "x"], [AC_SUBST([JAR], [jar])])
70-
AS_IF([test "x$ANT" = "x"], [AC_SUBST([ANT], [ant])])
7162
AS_IF([test "x$MPICC" = "x"], [AC_SUBST([MPICC], [mpicc])])
7263
AS_IF([test "x$MPICXX" = "x"], [AC_SUBST([MPICXX], [mpicxx])])
7364
AS_IF([test "x$QMAKE" = "x"], [AC_SUBST([QMAKE], [qmake-qt4])])
@@ -83,11 +74,6 @@ AC_PROG_RANLIB
8374
AX_CHECK_PROG([MPICC], [MPI compiler for C programming language has not been found])
8475
AX_CHECK_PROG([MPICXX], [MPI compiler for C++ programming language has not been found])
8576
AS_CASE(["$GOALS"],
86-
[*"java"*], [
87-
AX_CHECK_PROG([ANT], [ant is required but has not been found])
88-
AX_CHECK_PROG([JAR], [jar is required but has not been found])
89-
AX_CHECK_PROG([JAVAC], [javac is required but has not been found])
90-
],
9177
[*"qt"*], [
9278
AX_CHECK_PROG([QMAKE], [qmake-qt4 is required but has not been found])
9379
AC_CHECK_LIB([qwt-qt4],[QwtPlot::axisScaleEngine])

src/java/Makefile

Lines changed: 0 additions & 34 deletions
This file was deleted.

src/java/network_viewer/Makefile

Lines changed: 0 additions & 27 deletions
This file was deleted.

0 commit comments

Comments
 (0)