ayae/extra
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
Files
f8a70886f04a22fa4a33ff3c2781523dd9d0e861
extra/festival/speech_tools-without-java.patch
Astound f8a70886f0 initial import
2025-06-22 20:39:04 -05:00

479 lines
16 KiB
Diff
Raw Blame History

diff --git speech_tools.orig/Makefile speech_tools/Makefile
index f3343f1..ef8b23e 100644
--- speech_tools.orig/Makefile
+++ speech_tools/Makefile
@@ -47,7 +47,7 @@ LIB_BUILD_DIRS = audio utils base_class ling_class speech_class sigpr \
BUILD_DIRS = $(LIB_BUILD_DIRS) lib main scripts testsuite bin
TEMPLATE_DIRS=include audio utils base_class base_class/string \
ling_class speech_class sigpr stats grammar siod
-EXTRA_DIRS=siod java rxp wrappers
+EXTRA_DIRS=siod rxp wrappers
ALL_DIRS = include $(BUILD_DIRS) $(EXTRA_DIRS) config doc
VERSION=$(PROJECT_VERSION)
CONFIG=configure configure.in config.sub config.guess \
diff --git speech_tools.orig/config/compilers/Makefile speech_tools/config/compilers/Makefile
index 3d3d5bb..53470f2 100644
--- speech_tools.orig/config/compilers/Makefile
+++ speech_tools/config/compilers/Makefile
@@ -40,10 +40,10 @@ DIRNAME=config/compilers
COMPILERS = gcc.mak gcc27.mak gcc28.mak gcc295.mak \
egcs.mak gcc27emx.mak intel80.mak \
suncc.mak suncc40.mak \
- jolt.mak jdk.mak jdk12.mak none.mak \
- jikes.mak gcc296.mak gcc30.mak gcc31.mak gcc32.mak
+ none.mak \
+ gcc296.mak gcc30.mak gcc31.mak gcc32.mak
-FILES = Makefile $(COMPILERS) gcc_defaults.mak suncc_defaults.mak jdk_defaults.mak jikes_defaults.mak
+FILES = Makefile $(COMPILERS) gcc_defaults.mak suncc_defaults.mak
include $(TOP)/config/common_make_rules
diff --git speech_tools.orig/config/config.in speech_tools/config/config.in
index 15d563e..1e24249 100644
--- speech_tools.orig/config/config.in
+++ speech_tools/config/config.in
@@ -38,12 +38,6 @@ SYSTEM_TYPE=$(MACHINETYPE)_$(OSTYPE)$(OSREV)
COMPILER=@COMPILERTYPE@
###########################################################################
-## Java system to use if you include the Java interface.
-## Examples jdk
-
-JAVA_COMPILER=jdk
-
-###########################################################################
## Pre defined configurations (for directory locations, setup peculiarities
## etc.)
##
@@ -120,23 +114,6 @@ INCLUDE_MODULES += SCFG
INCLUDE_MODULES += WFST
INCLUDE_MODULES += OLS
-## Java
-
-
-## Define this to include the pure Java code
-# INCLUDE_MODULES += JAVA
-# JAVA_HOME = PUT_SOMETHING_HERE
-
-## Define this to compile the Java interface to the EST classes. You
-## need to compile with the SHARED option above. This is required for
-## fringe.
-# INCLUDE_MODULES += JAVA_CPP
-
-## Define this to have the Java code use the Java Media API to
-## play sounds etc.
-# INCLUDE_MODULES += JAVA_MEDIA
-# JMF_HOME = PUT_SOMETHING_HERE
-
## Richard Tobin's RXP XML parser.
INCLUDE_MODULES += RXP
@@ -198,10 +175,6 @@ include $(EST)/config/systems/$(SYSTEM_TYPE).mak
include $(EST)/config/compilers/$(COMPILER).mak
-ifneq ($(JAVA_COMPILER),none)
- include $(EST)/config/compilers/$(JAVA_COMPILER).mak
-endif
-
ifneq ($(CONFIGURATION),)
include $(CONFIGURATION:%=$(EST)/config/configs/%.mak)
endif
diff --git speech_tools.orig/config/configs/Makefile speech_tools/config/configs/Makefile
index d9c5f15..885156e 100644
--- speech_tools.orig/config/configs/Makefile
+++ speech_tools/config/configs/Makefile
@@ -48,10 +48,6 @@ DIRNAME=config/configs
##
## ellipsis Setup on cstr linux machine
##
-## kellogg Setup on cstr machine with different java location
-##
-## v_java Special setup for a with-java compilation at cstr
-##
## rjc Weird things in rjc's setup.
@@ -59,8 +55,6 @@ CONFIGURATIONS = \
egcs_as_gcc.mak \
cstr.mak \
ellipsis.mak \
- kellogg.mak \
- v_java.mak \
rjc.mak \
cstr_jdk1.2.mak
diff --git speech_tools.orig/config/modules/linux16_audio.mak speech_tools/config/modules/linux16_audio.mak
index 61d761c..31ec2b0 100644
--- speech_tools.orig/config/modules/linux16_audio.mak
+++ speech_tools/config/modules/linux16_audio.mak
@@ -56,10 +56,3 @@ endif
ifeq ($(LINUXAUDIO),none)
AUDIO_DEFINES += -DSUPPORT_VOXWARE
endif
-
-ifdef INCLUDE_JAVA_CPP
- AUDIO_DEFINES += -DTHREAD_SAFETY
- MODULE_LIBS += -lpthread
-endif
-
-
diff --git speech_tools.orig/config/project.mak speech_tools/config/project.mak
index 5e9c216..0bdd548 100644
--- speech_tools.orig/config/project.mak
+++ speech_tools/config/project.mak
@@ -63,7 +63,6 @@ DISTRIBUTED_MODULES = \
NAS_AUDIO ESD_AUDIO NATIVE_AUDIO MPLAYER_AUDIO \
EDITLINE \
SIOD WAGON SCFG WFST OLS \
- JAVA JAVA_CPP JAVA_MEDIA \
TCL RXP
DEVELOPMENT_MODULES = \
@@ -91,36 +90,22 @@ PROJECT_LIB_DIR = $(TOP)/lib
PROJECT_LIBRARIES = estools estbase eststring
-PROJECT_LIBRARIES_JAVA = estjava
-
PROJECT_LIBRARY_DIR = lib
PROJECT_LIBRARY_DIR_estools = $(TOP)/lib
PROJECT_LIBRARY_DIR_estbase = $(TOP)/lib
PROJECT_LIBRARY_DIR_eststring = $(TOP)/lib
-PROJECT_LIBRARY_DIR_estjava = $(TOP)/lib
PROJECT_LIBRARY_USES_estbase = eststring
-PROJECT_LIBRARY_USES_estjava = estbase eststring
-
PROJECT_LIBRARY_VERSION_estools = $(PROJECT_VERSION).1
PROJECT_LIBRARY_VERSION_estbase = $(PROJECT_VERSION).1
PROJECT_LIBRARY_VERSION_eststring = 1.2
-PROJECT_LIBRARY_VERSION_estjava = $(PROJECT_VERSION).1
-
-PROJECT_LIBRARY_NEEDS_SYSLIBS_estjava=1
PROJECT_DEFAULT_LIBRARY = estools
PROJECT_SHARED_LIBRARIES = eststring estbase
PROJECT_ALL_LIBRARIES = eststring estbase estools
-JAVA_CLASS_LIBRARY = $(LOCAL_JAVA_CLASS_LIBRARY)
-
-JAVA_CLASSPATH=$(LOCAL_JAVA_CLASSPATH):$(SYSTEM_JAVA_CLASSPATH)
-
-PROJECT_JAVA_ROOT=$(LOCAL_JAVA_ROOT)
-
# Libraries used from other projects
REQUIRED_LIBRARIES =
diff --git speech_tools.orig/config/rules/Makefile speech_tools/config/rules/Makefile
index bbc8dec..a155041 100644
--- speech_tools.orig/config/rules/Makefile
+++ speech_tools/config/rules/Makefile
@@ -41,7 +41,7 @@ TOP=../..
RULESETS = compile_options.mak defaults.mak library.mak make_depend.mak \
rcs.mak rules.mak targets.mak modules.mak \
- config_errors.mak visual_c.mak c.mak java.mak \
+ config_errors.mak visual_c.mak c.mak \
bin_process.mak install.mak top_level.mak doc.mak \
common_make_rules.mak test_make_rules.mak cvs.mak \
build_dir.mak
diff --git speech_tools.orig/config/rules/bin_process.mak speech_tools/config/rules/bin_process.mak
index a1b9807..3ab5730 100644
--- speech_tools.orig/config/rules/bin_process.mak
+++ speech_tools/config/rules/bin_process.mak
@@ -107,12 +107,7 @@ endif
main="$(MAIN)/$(DIRNAME)" \
lib="$($(PROJECT_PREFIX)_HOME)/$(PROJECT_LIBRARY_DIR)" \
est="'$(EST_HOME)'" \
- classpath="$(SYSTEM_JAVA_CLASSPATH)" \
perl="$(PERL)" \
- javahome="$(JAVA_HOME)" \
- java="$(JAVA)" \
- javac="$(JAVAC)" \
- java_version="$(EST_JAVA_VERSION)" \
ldpath="$(SYSTEM_LD_LIBRARY_PATH)" \
ldvar="$(LD_LIBRARY_PATH_VARIABLE)" \
$(PROJECT_SCRIPTS_DIR)/shared_script > "$(subst TOP,$(TOP),$(BIN))/$$b" ;\
@@ -154,11 +149,6 @@ endif
topdir="$($(PROJECT_PREFIX)_HOME)" \
est="'$(EST_HOME)'" \
perl="$(PERL)" \
- javahome=$(JAVA_HOME) \
- java_version="$(EST_JAVA_VERSION)" \
- java=$(JAVA) \
- javac=$(JAVAC) \
- classpath=$(SYSTEM_JAVA_CLASSPATH) \
ldpath="$(SYSTEM_LD_LIBRARY_PATH)" \
ldvar="$(LD_LIBRARY_PATH_VARIABLE)" \
"$$script" > "$(subst TOP,$(TOP),$(BIN))/$$b" ;\
diff --git speech_tools.orig/config/rules/common_make_rules.mak speech_tools/config/rules/common_make_rules.mak
index bd23c02..b69234c 100644
--- speech_tools.orig/config/rules/common_make_rules.mak
+++ speech_tools/config/rules/common_make_rules.mak
@@ -54,10 +54,6 @@ endif
# export TEMPLATE_DIRS
export CI_ARGS
-ifdef JAVA_CLASSES
- NEED_JAVA=1
-endif
-
# Various subsets of directories
ifndef ALL_DIRS
@@ -66,10 +62,6 @@ ifdef BUILD_DIRS
endif
endif
-ifdef JAVA_COMMON_DIRS
- JUST_BUILD_DIRS := $(JUST_BUILD_DIRS) $(notdir $(JAVA_COMMON_DIRS))
-endif
-
ifdef JUST_LIB
SUBDIRECTORIES = ${JUST_BUILD_DIRS} ${LIB_BUILD_DIRS} ${EXTRA_LIB_BUILD_DIRS}
else
@@ -95,10 +87,6 @@ include $(EST)/config/rules/cvs.mak
include $(EST)/config/rules/c.mak
-ifdef NEED_JAVA
-include $(EST)/config/rules/java.mak
-endif
-
include $(EST)/config/rules/config_errors.mak
# keep track of the places we put templates. Used for compiling things
diff --git speech_tools.orig/config/rules/compile_options.mak speech_tools/config/rules/compile_options.mak
index dfe53b9..5ace28f 100644
--- speech_tools.orig/config/rules/compile_options.mak
+++ speech_tools/config/rules/compile_options.mak
@@ -113,9 +113,6 @@ ifneq ($(DEBUG),0)
ifneq ($(OPTIMISE),4)
CFLAGS += $(DEBUG_CCFLAGS)
CXXFLAGS += $(DEBUG_CXXFLAGS)
- JAVAFLAGS += $(DEBUG_JAVAFLAGS)
- JAVAC := $(DEBUG_JAVAC)
- JAVAH := $(DEBUG_JAVAH)
LINKFLAGS += $(DEBUG_LINKFLAGS)
endif
endif
@@ -132,7 +129,6 @@ endif
ifneq ($(OPTIMISE),0)
CFLAGS += $(OPTIMISE_CCFLAGS)
CXXFLAGS += $(OPTIMISE_CXXFLAGS)
- JAVAFLAGS += $(OPTIMISE_JAVAFLAGS)
LINKFLAGS += $(OPTIMISE_LINKFLAGS)
endif
@@ -149,12 +145,10 @@ endif
ifneq ($(WARN),0)
CFLAGS += $(WARN_CCFLAGS)
CXXFLAGS += $(WARN_CXXFLAGS)
- JAVAFLAGS += $(WARN_JAVAFLAGS)
LINKFLAGS += $(WARN_LINKFLAGS)
else
CFLAGS += $(NOWARN_CCFLAGS)
CXXFLAGS += $(NOWARN_CXXFLAGS)
- JAVAFLAGS += $(NOWARN_JAVAFLAGS)
LINKFLAGS += $(NOWARN_LINKFLAGS)
endif
@@ -162,7 +156,6 @@ endif
ifneq ($(VERBOSE),0)
CFLAGS += $(VERBOSE_CCFLAGS)
CXXFLAGS += $(VERBOSE_CXXFLAGS)
- JAVAFLAGS += $(VERBOSE_JAVAFLAGS)
LINKFLAGS += $(VERBOSE_LINKFLAGS)
endif
diff --git speech_tools.orig/config/rules/config_errors.mak speech_tools/config/rules/config_errors.mak
index 3b7bd7e..6218dc3 100644
--- speech_tools.orig/config/rules/config_errors.mak
+++ speech_tools/config/rules/config_errors.mak
@@ -39,14 +39,4 @@
## ##
###########################################################################
-ifdef NEED_JAVA
-ifndef INCLUDE_JAVA
-.config_error:: FORCE
- @echo "+------------------------------------------------------"
- @echo "| This system requires java support in the speech tools"
- @echo "+------------------------------------------------------"
- @exit 1
-endif
-endif
-
.config_error:: FORCE
diff --git speech_tools.orig/config/rules/defaults.mak speech_tools/config/rules/defaults.mak
index aca1573..27ec08a 100644
--- speech_tools.orig/config/rules/defaults.mak
+++ speech_tools/config/rules/defaults.mak
@@ -153,12 +153,6 @@ ifndef NON_PROJECT_LIBS
NON_PROJECT_LIBS = $(CONFIG_LIBS) $(LOCAL_LIBS) $(REQUIRED_LIBS) \
$(SYSTEM_LD_LIBRARY_PATH:%=-L%) \
$(MODULE_LIBS) $(MODULE_EXTRA_LIBS) $(DEBUG_LIBS) $(OS_LIBS) $(MATH_LIBRARY) $(COMPILERLIBS)
-
-# reduced list for linking with java code.
-
- JAVA_PROJECT_LIBS = $(CONFIG_LIBS) $(LOCAL_LIBS) $(REQUIRED_LIBS) \
- $(SYSTEM_LD_LIBRARY_PATH:%=-L%) \
- $(MODULE_LIBS) $(DEBUG_LIBS) $(OS_LIBS) $(MATH_LIBRARY) $(COMPILERLIBS)
endif
## Default C Compilation
diff --git speech_tools.orig/config/rules/library.mak speech_tools/config/rules/library.mak
index 0181988..f93d019 100644
--- speech_tools.orig/config/rules/library.mak
+++ speech_tools/config/rules/library.mak
@@ -107,7 +107,6 @@ lib%.so : lib%.a
@if [ ! -d shared_space ] ; then mkdir shared_space ; else $(RM) -f shared_space/*.o ; fi
@(cd shared_space ; $(AR) x ../$< )
@echo Link Shared Library $*
- if [ -n "$(PROJECT_LIBRARY_NEEDS_SYSLIBS_$*)" ] ; then libs='$(JAVA_PROJECT_LIBS)' ; fi ;\
$(subst XXX,$@.$(PROJECT_LIBRARY_VERSION_$*),$(MAKE_SHARED_LIB)) shared_space/*.o $(PROJECT_LIBRARY_USES_$*:%=-L. -l%) $$libs
@$(RM) -f shared_space/*.o $@
@ln -s $@.$(PROJECT_LIBRARY_VERSION_$*) $@
diff --git speech_tools.orig/config/rules/make_depend.mak speech_tools/config/rules/make_depend.mak
index 26589ec..4d01b47 100644
--- speech_tools.orig/config/rules/make_depend.mak
+++ speech_tools/config/rules/make_depend.mak
@@ -39,7 +39,7 @@
###########################################################################
ifndef ALL_DEPEND
- ALL_DEPEND = $(SRCS) $(CPPSRCS) $(CSRCS) $(JAVA_CLASSES:%=%.java)
+ ALL_DEPEND = $(SRCS) $(CPPSRCS) $(CSRCS)
endif
$(DEPEND): $(ALL_DEPEND)
@@ -68,7 +68,6 @@ ifneq ($(ALL_DEPEND),)
case "$$ext" in \
c) $(MAKE_DEPEND_C) $(DEPEND_FLAGS) "$$i";;\
cc) $(MAKE_DEPEND_CXX) $(DEPEND_FLAGS) "$$i";;\
- java) echo "$$basename.class : $$basename.java";;\
*) echo "# Can't make depend for extension $$ext";;\
esac ;\
}|\
diff --git speech_tools.orig/config/rules/script_process.awk speech_tools/config/rules/script_process.awk
index d8976f3..67d4eb4 100644
--- speech_tools.orig/config/rules/script_process.awk
+++ speech_tools/config/rules/script_process.awk
@@ -44,26 +44,6 @@
sub(/__PERL__/, perl);
}
-/__CLASSPATH__/ {
- sub(/__CLASSPATH__/, classpath);
-}
-
-/__JAVA__/ {
- sub(/__JAVA__/, java);
-}
-
-/__JAVAC__/ {
- sub(/__JAVAC__/, javac);
-}
-
-/__JAVA_VERSION__/ {
- sub(/__JAVA_VERSION__/, java_version);
-}
-
-/__JAVA_HOME__/ {
- sub(/__JAVA_HOME__/, javahome);
-}
-
/__LDPATH__/ {
sub(/__LDPATH__/, ldpath);
}
diff --git speech_tools.orig/config/rules/targets.mak speech_tools/config/rules/targets.mak
index f052401..dcce8e2 100644
--- speech_tools.orig/config/rules/targets.mak
+++ speech_tools/config/rules/targets.mak
@@ -66,7 +66,7 @@ ${SUBDIRECTORIES} dummy_dir_name: FORCE
## Clean up junk
clean:
- $(RM) -fr $(OBJS) $(JAVA_CLASSES_CLASS) $(ALL_EXECS) $(ALL_EXECS:%=%.mak) $(ALL_LIBS) $(LOCAL_CLEAN) make.depend .buildlib* *~
+ $(RM) -fr $(OBJS) $(ALL_EXECS) $(ALL_EXECS:%=%.mak) $(ALL_LIBS) $(LOCAL_CLEAN) make.depend .buildlib* *~
ifdef ALL_DIRS
@ for i in $(ALL_DIRS) ; \
do \
diff --git speech_tools.orig/config/rules/top_level.mak speech_tools/config/rules/top_level.mak
index 9aa3f12..a7f1028 100644
--- speech_tools.orig/config/rules/top_level.mak
+++ speech_tools/config/rules/top_level.mak
@@ -50,13 +50,6 @@ real-info:
fi ;\
echo 'SYSTEM_TYPE:=:$(SYSTEM_TYPE)' ;\
echo 'COMPILER:=:$(COMPILER_DESC) '`$(COMPILER_VERSION_COMMAND)` ;\
- if [ '$(JAVA_COMPILER)' != none ] ;\
- then \
- echo 'JAVA_COMPILER:=:$(JAVA_COMPILER_DESC) '`$(JAVA_COMPILER_VERSION_COMMAND)` ;\
- echo 'JAVA_HOME:=:$(JAVA_HOME)' ;\
- echo 'JMF_HOME:=:$(JMF_HOME)' ;\
- echo 'JSAPI_HOME:=:$(JSAPI_HOME)' ;\
- fi ;\
echo 'CONFIGURATION:=:$(CONFIGURATION)' ;\
if [ -n '$(LOCAL_REPOSITORY)' ] ;\
then \
@@ -75,10 +68,6 @@ real-info:
echo 'TEMPLATES:=:$(TEMPLATES)' ;\
echo 'DEFINES:=:$(DEFINES)' ;\
echo 'LIBS:=:$(LIBS)' ;\
- if [ '$(JAVA_COMPILER)' != none ] ;\
- then \
- echo 'JAVA_CLASSPATH:=:$(JAVA_CLASSPATH)' ;\
- fi ;\
echo '' ;\
echo '---------------------------------------------------------------' ;\
} | $(KV_COMMAND) FS=':=:' sep=' = ' ind=22
diff --git speech_tools.orig/config/systems/Linux.mak speech_tools/config/systems/Linux.mak
index 923c9a7..7b7cb51 100644
--- speech_tools.orig/config/systems/Linux.mak
+++ speech_tools/config/systems/Linux.mak
@@ -40,11 +40,6 @@
include $(EST)/config/systems/default.mak
-DEFAULT_JAVA_HOME=/usr/lib/jdk-1.1.6
-JAVA=/usr/bin/java
-JAVAC=/usr/bin/javac
-JAVAH=/usr/bin/javah
-
TCL_LIBRARY = -ltcl
OS_LIBS = -ldl
diff --git speech_tools.orig/config/systems/default.mak speech_tools/config/systems/default.mak
index 50477be..24d6dea 100644
--- speech_tools.orig/config/systems/default.mak
+++ speech_tools/config/systems/default.mak
@@ -140,6 +140,3 @@ DOCXX_ARGS = -a -f -B banner.inc -M sane -D 'SYSTEM "$(EST_HOME)/doc/sane.dtd"'
COMPILER_VERSION_COMMAND=true
-JAVA_COMPILER_VERSION_COMMAND=true
-
-JAVA_SYSTEM_INCLUDES = -I$(JAVA_HOME)/include/genunix
diff --git speech_tools.orig/lib/Makefile speech_tools/lib/Makefile
index 0ff24b0..bfece4f 100644
--- speech_tools.orig/lib/Makefile
+++ speech_tools/lib/Makefile
@@ -77,11 +77,7 @@ $(SKELETONS:%-in=%) : %: %-in
defines='$(DEFINES)' \
libs='$(LIBS_ABS)' \
est='$(EST_HOME)' \
- classpath='$(SYSTEM_JAVA_CLASSPATH)' \
perl='$(PERL)' \
- javahome='$(JAVA_HOME)' \
- java='$(JAVA)' \
- javac='$(JAVAC)' \
ldpath='$(SYSTEM_LD_LIBRARY_PATH)' \
cccommand='$(CC_COMMAND_ABS)' \
cxxcommand='$(CXX_COMMAND_ABS)' \
Reference in New Issue View Git Blame Copy Permalink