mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Setting CLASSPATH/XCLASSPATH appears to be a leftover

Browse Source 
...from the old dmake and/or Hamburg-specific set up.

Change-Id: I441ce66dd91d353196cd9d1a9853720195a6fcdc
This commit is contained in:
Stephan Bergmann
2012-10-29 13:29:47 +01:00
parent 0f075129c9
commit 14d45795b2
4 changed files with 1 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
config_host.mk.in
View File

@@ -58,7 +58,6 @@ export CFLAGS=@CFLAGS@
endif endif
export CHECK_PARALLELISM=@CHECK_PARALLELISM@ export CHECK_PARALLELISM=@CHECK_PARALLELISM@
export CLANGPLUGIN_CPPFLAGS=@CLANGPLUGIN_CPPFLAGS@ export CLANGPLUGIN_CPPFLAGS=@CLANGPLUGIN_CPPFLAGS@
export CLASSPATH=@CLASSPATH@
export CLUCENE_CFLAGS=@CLUCENE_CFLAGS@ export CLUCENE_CFLAGS=@CLUCENE_CFLAGS@
export CLUCENE_LIBS=@CLUCENE_LIBS@ export CLUCENE_LIBS=@CLUCENE_LIBS@
export CLUCENE_TARBALL=@CLUCENE_TARBALL@ export CLUCENE_TARBALL=@CLUCENE_TARBALL@
@@ -693,7 +692,6 @@ export WPG_TARBALL=@WPG_TARBALL@
export WPS_CFLAGS=@WPS_CFLAGS@ export WPS_CFLAGS=@WPS_CFLAGS@
export WPS_LIBS=@WPS_LIBS@ export WPS_LIBS=@WPS_LIBS@
export WPS_TARBALL=@WPS_TARBALL@ export WPS_TARBALL=@WPS_TARBALL@
export XCLASSPATH=@XCLASSPATH@
export XINERAMA_LINK=@XINERAMA_LINK@ export XINERAMA_LINK=@XINERAMA_LINK@
export XMLLINT=@XMLLINT@ export XMLLINT=@XMLLINT@
export XRANDR_CFLAGS=@XRANDR_CFLAGS@ export XRANDR_CFLAGS=@XRANDR_CFLAGS@

10
configure.ac
View File

@@ -6468,20 +6468,11 @@ if test "$SOLAR_JAVA" != ""; then
test -d "$JRE_BASE_DIR/$JAVA_TOOLKIT" && JAVALIB="$JAVALIB -L$JRE_BASE_DIR/$JAVA_TOOLKIT" test -d "$JRE_BASE_DIR/$JAVA_TOOLKIT" && JAVALIB="$JAVALIB -L$JRE_BASE_DIR/$JAVA_TOOLKIT"
test -d "$JRE_BASE_DIR/native_thread" && JAVALIB="$JAVALIB -L$JRE_BASE_DIR/native_thread" test -d "$JRE_BASE_DIR/native_thread" && JAVALIB="$JAVALIB -L$JRE_BASE_DIR/native_thread"
fi fi
CLASSPATH=
if test "$JDK"!="gcj"; then
if test -f "$JAVA_HOME/jre/lib/rt.jar"; then
CLASSPATH="${JAVA_HOME}/jre/lib/rt.jar${P_SEP}."
fi
fi
XCLASSPATH="$CLASSPATH"
else else
x_JAVALIB=[\#] x_JAVALIB=[\#]
x_JDKLIB=[\#] x_JDKLIB=[\#]
fi fi
AC_SUBST(CLASSPATH)
AC_SUBST(JAVALIB) AC_SUBST(JAVALIB)
AC_SUBST(JAVACOMPILER) AC_SUBST(JAVACOMPILER)
AC_SUBST(JAVADOC) AC_SUBST(JAVADOC)
@@ -6492,7 +6483,6 @@ AC_SUBST(JAVA_SOURCE_VER)
AC_SUBST(JAVA_TARGET_VER) AC_SUBST(JAVA_TARGET_VER)
AC_SUBST(JDK) AC_SUBST(JDK)
AC_SUBST(JDKLIB) AC_SUBST(JDKLIB)
AC_SUBST(XCLASSPATH)
AC_SUBST(x_JAVALIB) AC_SUBST(x_JAVALIB)
AC_SUBST(x_JDKLIB) AC_SUBST(x_JDKLIB)

1
solenv/gbuild/Jar.mk
View File

@@ -96,7 +96,6 @@ $(call gb_Jar_get_target,$(1)) : PACKAGEROOTS :=
$(call gb_Jar_get_target,$(1)) : PACKAGEDIRS := $(call gb_Jar_get_target,$(1)) : PACKAGEDIRS :=
$(call gb_Jar_get_target,$(1)) : PACKAGEFILES := $(call gb_Jar_get_target,$(1)) : PACKAGEFILES :=
$(call gb_JavaClassSet_JavaClassSet,$(call gb_Jar_get_classsetname,$(1))) $(call gb_JavaClassSet_JavaClassSet,$(call gb_Jar_get_classsetname,$(1)))
$(call gb_JavaClassSet_add_classpath,$(call gb_Jar_get_classsetname,$(1)),$(value XCLASSPATH))
$(eval $(call gb_Module_register_target,$(call gb_Jar_get_outdir_target,$(1)),$(call gb_Jar_get_clean_target,$(1)))) $(eval $(call gb_Module_register_target,$(call gb_Jar_get_outdir_target,$(1)),$(call gb_Jar_get_clean_target,$(1))))
$(call gb_Deliver_add_deliverable,$(call gb_Jar_get_outdir_target,$(1)),$(call gb_Jar_get_target,$(1)),$(1)) $(call gb_Deliver_add_deliverable,$(call gb_Jar_get_outdir_target,$(1)),$(call gb_Jar_get_target,$(1)),$(1))
$(call gb_Jar_get_outdir_target,$(1)) : $(call gb_Jar_get_target,$(1)) $(call gb_Jar_get_outdir_target,$(1)) : $(call gb_Jar_get_target,$(1))

2
solenv/gbuild/JunitTest.mk
View File

@@ -67,7 +67,7 @@ $(call gb_JunitTest_get_target,%) :
$(CLEAN_CMD) $(CLEAN_CMD)
define gb_JunitTest_JunitTest define gb_JunitTest_JunitTest
$(call gb_JunitTest_get_target,$(1)) : T_CP := $(if $(value XCLASSPATH),$$(value XCLASSPATH)$$(gb_CLASSPATHSEP))$(call gb_JavaClassSet_get_classdir,$(call gb_JunitTest_get_classsetname,$(1)))$$(gb_CLASSPATHSEP)$(OOO_JUNIT_JAR)$$(gb_CLASSPATHSEP)$(OUTDIR)/lib $(call gb_JunitTest_get_target,$(1)) : T_CP := $(call gb_JavaClassSet_get_classdir,$(call gb_JunitTest_get_classsetname,$(1)))$$(gb_CLASSPATHSEP)$(OOO_JUNIT_JAR)$$(gb_CLASSPATHSEP)$(OUTDIR)/lib
$(call gb_JunitTest_get_target,$(1)) : CLASSES := $(call gb_JunitTest_get_target,$(1)) : CLASSES :=
$(eval $(call gb_JunitTest_JunitTest_platform,$(1))) $(eval $(call gb_JunitTest_JunitTest_platform,$(1)))