Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrew Niefer2007-02-07 18:30:56 +0000
committerAndrew Niefer2007-02-07 18:30:56 +0000
commitc1cb199965b0f2828780876cc0dc29808cead9d8 (patch)
treee6bd3f83449073471e9ec08310efb10db78f1773 /bundles/org.eclipse.equinox.executable/library/motif
parente4f85e8af5a6ab4c2966c1aac9edc989fb29e257 (diff)
downloadrt.equinox.framework-c1cb199965b0f2828780876cc0dc29808cead9d8.tar.gz
rt.equinox.framework-c1cb199965b0f2828780876cc0dc29808cead9d8.tar.xz
rt.equinox.framework-c1cb199965b0f2828780876cc0dc29808cead9d8.zip
motif.linux for debug purposes
Diffstat (limited to 'bundles/org.eclipse.equinox.executable/library/motif')
-rw-r--r--bundles/org.eclipse.equinox.executable/library/motif/build.sh12
-rw-r--r--bundles/org.eclipse.equinox.executable/library/motif/eclipseMotif.c6
-rw-r--r--bundles/org.eclipse.equinox.executable/library/motif/make_linux.mak7
3 files changed, 15 insertions, 10 deletions
diff --git a/bundles/org.eclipse.equinox.executable/library/motif/build.sh b/bundles/org.eclipse.equinox.executable/library/motif/build.sh
index 86ea1eab2..169ae2337 100644
--- a/bundles/org.eclipse.equinox.executable/library/motif/build.sh
+++ b/bundles/org.eclipse.equinox.executable/library/motif/build.sh
@@ -19,6 +19,7 @@
# -os <DEFAULT_OS> - default Eclipse "-os" value
# -arch <DEFAULT_OS_ARCH> - default Eclipse "-arch" value
# -ws <DEFAULT_WS> - default Eclipse "-ws" value
+# -java <JAVA_HOME> - java insgtall for jni headers
#
#
# This script can also be invoked with the "clean" argument.
@@ -29,8 +30,9 @@ cd `dirname $0`
programOutput="eclipse"
defaultOS=""
defaultOSArch=""
-defaultWS=""
+defaultWS="motif"
makefile=""
+javaHome=""
if [ "$OS" = "" ]; then
OS=`uname -s`
fi
@@ -53,7 +55,7 @@ case $OS in
defaultOSArch="x86"
defaultWS="motif"
X11_HOME=/usr/X11R6
- MOTIF_HOME=/bluebird/teamswt/swt-builddir/motif21
+ MOTIF_HOME=/usr
OUTPUT_DIR="../../bin/$defaultWS/$defaultOS/$defaultOSArch"
;;
"SunOS")
@@ -106,6 +108,9 @@ while [ "$1" != "" ]; do
elif [ "$1" = "-output" ] && [ "$2" != "" ]; then
programOutput="$2"
shift
+ elif [ "$1" = "-java" ] && [ "$2" != "" ]; then
+ javaHome="$2"
+ shift
else
extraArgs="$extraArgs $1"
fi
@@ -117,8 +122,9 @@ PROGRAM_OUTPUT="$programOutput"
DEFAULT_OS="$defaultOS"
DEFAULT_OS_ARCH="$defaultOSArch"
DEFAULT_WS="$defaultWS"
+JAVA_HOME=$javaHome
-export OUTPUT_DIR PROGRAM_OUTPUT DEFAULT_OS DEFAULT_OS_ARCH DEFAULT_WS X11_HOME MOTIF_HOME
+export OUTPUT_DIR PROGRAM_OUTPUT DEFAULT_OS DEFAULT_OS_ARCH DEFAULT_WS X11_HOME MOTIF_HOME JAVA_HOME
# If the OS is supported (a makefile exists)
if [ "$makefile" != "" ]; then
diff --git a/bundles/org.eclipse.equinox.executable/library/motif/eclipseMotif.c b/bundles/org.eclipse.equinox.executable/library/motif/eclipseMotif.c
index 3237fc9d1..16d7d650b 100644
--- a/bundles/org.eclipse.equinox.executable/library/motif/eclipseMotif.c
+++ b/bundles/org.eclipse.equinox.executable/library/motif/eclipseMotif.c
@@ -267,12 +267,6 @@ static void fixEnvForNetscape()
}
#endif /* NETSCAPE_FIX */
-void restartLauncher( char* program, char* args[] )
-{
- /* just restart in-place */
- execv(program, args);
-}
-
int launchJavaVM( char* args[] )
{
int exitCode;
diff --git a/bundles/org.eclipse.equinox.executable/library/motif/make_linux.mak b/bundles/org.eclipse.equinox.executable/library/motif/make_linux.mak
index 1c0ab8594..e9aea02b3 100644
--- a/bundles/org.eclipse.equinox.executable/library/motif/make_linux.mak
+++ b/bundles/org.eclipse.equinox.executable/library/motif/make_linux.mak
@@ -29,6 +29,10 @@ endif
PROGRAM_LIBRARY=eclipse_$(LIB_VERSION).so
+ifeq ($(DEFAULT_JAVA),)
+ DEFAULT_JAVA=DEFAULT_JAVA_JNI
+endif
+
# Define the object modules to be compiled and flags.
CC=gcc
MAIN_OBJS = eclipseMain.o
@@ -46,6 +50,7 @@ CFLAGS = -g -s -Wall \
-DDEFAULT_OS="\"$(DEFAULT_OS)\"" \
-DDEFAULT_OS_ARCH="\"$(DEFAULT_OS_ARCH)\"" \
-DDEFAULT_WS="\"$(DEFAULT_WS)\"" \
+ -D$(DEFAULT_JAVA)\
-fPIC \
-I./ \
-I../ \
@@ -79,7 +84,7 @@ eclipseConfig.o: ../eclipseConfig.c ../eclipseConfig.h ../eclipseOS.h
eclipseMozilla.o: ../eclipseMozilla.c ../eclipseMozilla.h ../eclipseOS.h
$(CC) $(CFLAGS) -c $< -o $@
-eclipseShm.o: ../eclipseShm.h ../eclipseUnicode.h ../eclipseShm.c
+eclipseShm.o: ../eclipseShm.c ../eclipseShm.h ../eclipseUnicode.h
$(CC) $(CFLAGS) -c $< -o $@
eclipseNix.o: ../eclipseNix.c

Back to the top