diff options
author | Andrew Niefer | 2008-07-31 16:55:10 +0000 |
---|---|---|
committer | Andrew Niefer | 2008-07-31 16:55:10 +0000 |
commit | 6f7653aaf7f4e6e13867862973cc697a69d9aa5a (patch) | |
tree | 6cd7c39b0b396dad831e496a99e3dea10b4c3b4d /bundles/org.eclipse.equinox.executable/library | |
parent | fb3912400f623a739c2db854a254ddb1468b7132 (diff) | |
download | rt.equinox.framework-6f7653aaf7f4e6e13867862973cc697a69d9aa5a.tar.gz rt.equinox.framework-6f7653aaf7f4e6e13867862973cc697a69d9aa5a.tar.xz rt.equinox.framework-6f7653aaf7f4e6e13867862973cc697a69d9aa5a.zip |
bug 184468 - some automation
Diffstat (limited to 'bundles/org.eclipse.equinox.executable/library')
8 files changed, 23 insertions, 9 deletions
diff --git a/bundles/org.eclipse.equinox.executable/library/gtk/build.sh b/bundles/org.eclipse.equinox.executable/library/gtk/build.sh index 455c369b9..2faefcdb7 100644 --- a/bundles/org.eclipse.equinox.executable/library/gtk/build.sh +++ b/bundles/org.eclipse.equinox.executable/library/gtk/build.sh @@ -57,6 +57,7 @@ case $OS in "x86_64") defaultOSArch="x86_64" defaultJava=DEFAULT_JAVA_EXEC + javaHome="/usr/java64/1.5" OUTPUT_DIR="../../bin/$defaultWS/$defaultOS/$defaultOSArch" ;; i?86) @@ -96,6 +97,7 @@ case $OS in "SunOS") makefile="make_solaris.mak" defaultOS="solaris" + javaHome="/usr/jdk/jdk1.5.0_01" OUTPUT_DIR="../../bin/$defaultWS/$defaultOS/$defaultOSArch" #PATH=/usr/ccs/bin:/opt/SUNWspro/bin:$PATH PATH=/usr/ccs/bin:/export/home/SUNWspro/bin:$PATH @@ -152,7 +154,10 @@ DEFAULT_WS="$defaultWS" JAVA_HOME=$javaHome DEFAULT_JAVA=$defaultJava -export OUTPUT_DIR PROGRAM_OUTPUT DEFAULT_OS DEFAULT_OS_ARCH DEFAULT_WS JAVA_HOME DEFAULT_JAVA +LIBRARY_DIR="../../../org.eclipse.equinox.launcher/fragments/org.eclipse.equinox.launcher.$defaultWS.$defaultOS.$defaultOSArch" +OUTPUT_DIR="../../bin/$defaultWS/$defaultOS/$defaultOSArch" + +export OUTPUT_DIR PROGRAM_OUTPUT DEFAULT_OS DEFAULT_OS_ARCH DEFAULT_WS JAVA_HOME DEFAULT_JAVA LIBRARY_DIR # If the OS is supported (a makefile exists) if [ "$makefile" != "" ]; then diff --git a/bundles/org.eclipse.equinox.executable/library/gtk/make_linux.mak b/bundles/org.eclipse.equinox.executable/library/gtk/make_linux.mak index 297799839..8cd49b64d 100644 --- a/bundles/org.eclipse.equinox.executable/library/gtk/make_linux.mak +++ b/bundles/org.eclipse.equinox.executable/library/gtk/make_linux.mak @@ -101,7 +101,8 @@ $(DLL): $(DLL_OBJS) $(COMMON_OBJS) $(CC) $(LFLAGS) -o $(DLL) $(DLL_OBJS) $(COMMON_OBJS) $(LIBS) install: all - cp $(EXEC) $(DLL) $(OUTPUT_DIR) + cp $(EXEC) $(OUTPUT_DIR) + cp $(DLL) $(LIBRARY_DIR) rm -f $(EXEC) $(DLL) $(MAIN_OBJS) $(COMMON_OBJS) $(DLL_OBJS) clean: diff --git a/bundles/org.eclipse.equinox.executable/library/gtk/make_solaris.mak b/bundles/org.eclipse.equinox.executable/library/gtk/make_solaris.mak index b2224a0b2..c27d9ec3d 100644 --- a/bundles/org.eclipse.equinox.executable/library/gtk/make_solaris.mak +++ b/bundles/org.eclipse.equinox.executable/library/gtk/make_solaris.mak @@ -96,7 +96,8 @@ $(DLL): $(DLL_OBJS) $(COMMON_OBJS) $(CC) $(LFLAGS) -o $(DLL) $(DLL_OBJS) $(COMMON_OBJS) $(LIBS) install: all - cp $(EXEC) $(DLL) $(OUTPUT_DIR) + cp $(EXEC) $(OUTPUT_DIR) + cp $(DLL) $(LIBRARY_DIR) rm -f $(EXEC) $(DLL) $(MAIN_OBJS) $(COMMON_OBJS) $(DLL_OBJS) clean: diff --git a/bundles/org.eclipse.equinox.executable/library/motif/build.sh b/bundles/org.eclipse.equinox.executable/library/motif/build.sh index 0052e3f2b..9d38b1f71 100644 --- a/bundles/org.eclipse.equinox.executable/library/motif/build.sh +++ b/bundles/org.eclipse.equinox.executable/library/motif/build.sh @@ -136,7 +136,10 @@ DEFAULT_WS="$defaultWS" JAVA_HOME=$javaHome DEFAULT_JAVA=$defaultJava -export OUTPUT_DIR PROGRAM_OUTPUT DEFAULT_OS DEFAULT_OS_ARCH DEFAULT_WS X11_HOME MOTIF_HOME JAVA_HOME DEFAULT_JAVA +LIBRARY_DIR="../../../org.eclipse.equinox.launcher/fragments/org.eclipse.equinox.launcher.$defaultWS.$defaultOS.$defaultOSArch" +OUTPUT_DIR="../../bin/$defaultWS/$defaultOS/$defaultOSArch" + +export OUTPUT_DIR PROGRAM_OUTPUT DEFAULT_OS DEFAULT_OS_ARCH DEFAULT_WS X11_HOME MOTIF_HOME JAVA_HOME DEFAULT_JAVA LIBRARY_DIR # If the OS is supported (a makefile exists) if [ "$makefile" != "" ]; then diff --git a/bundles/org.eclipse.equinox.executable/library/motif/make_aix.mak b/bundles/org.eclipse.equinox.executable/library/motif/make_aix.mak index 446bfe53e..023ca65b6 100644 --- a/bundles/org.eclipse.equinox.executable/library/motif/make_aix.mak +++ b/bundles/org.eclipse.equinox.executable/library/motif/make_aix.mak @@ -49,7 +49,7 @@ CFLAGS = -O -s \ -I./ \ -I../ \ -I$(MOTIF_HOME)/include \ - -I/usr/java150/include + -I/usr/java5/include all: $(EXEC) $(DLL) @@ -87,7 +87,8 @@ $(DLL): $(DLL_OBJS) $(COMMON_OBJS) ld $(LFLAGS) -o $(DLL) $(DLL_OBJS) $(COMMON_OBJS) $(LIBS) install: all - cp $(EXEC) $(DLL) $(OUTPUT_DIR) + cp $(EXEC) $(OUTPUT_DIR) + cp $(DLL) $(LIBRARY_DIR) rm -f $(EXEC) $(MAIN_OBJS) $(COMMON_OBJS) $(DLL_OBJS) clean: diff --git a/bundles/org.eclipse.equinox.executable/library/motif/make_hpux_ia64_32.mak b/bundles/org.eclipse.equinox.executable/library/motif/make_hpux_ia64_32.mak index 7bd874e88..70fd19415 100644 --- a/bundles/org.eclipse.equinox.executable/library/motif/make_hpux_ia64_32.mak +++ b/bundles/org.eclipse.equinox.executable/library/motif/make_hpux_ia64_32.mak @@ -93,7 +93,8 @@ $(DLL): $(DLL_OBJS) $(COMMON_OBJS) $(CC) $(LFLAGS) -o $(DLL) $(DLL_OBJS) $(COMMON_OBJS) $(LIBS) install: all - cp $(EXEC) $(DLL) $(OUTPUT_DIR) + cp $(EXEC) $(OUTPUT_DIR) + cp $(DLL) $(LIBRARY_DIR) rm -f $(EXEC) $(MAIN_OBJS) $(COMMON_OBJS) $(DLL_OBJS) clean: 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 740a75986..25ccd2b92 100644 --- a/bundles/org.eclipse.equinox.executable/library/motif/make_linux.mak +++ b/bundles/org.eclipse.equinox.executable/library/motif/make_linux.mak @@ -100,7 +100,8 @@ $(DLL): $(DLL_OBJS) $(COMMON_OBJS) $(CC) $(LFLAGS) -o $(DLL) $(DLL_OBJS) $(COMMON_OBJS) $(LIBS) install: all - cp $(EXEC) $(DLL) $(OUTPUT_DIR) + cp $(EXEC) $(OUTPUT_DIR) + cp $(DLL) $(LIBRARY_DIR) rm -f $(EXEC) $(MAIN_OBJS) $(COMMON_OBJS) $(DLL_OBJS) clean: diff --git a/bundles/org.eclipse.equinox.executable/library/motif/make_solaris.mak b/bundles/org.eclipse.equinox.executable/library/motif/make_solaris.mak index fad1e84a5..d9f752770 100644 --- a/bundles/org.eclipse.equinox.executable/library/motif/make_solaris.mak +++ b/bundles/org.eclipse.equinox.executable/library/motif/make_solaris.mak @@ -96,7 +96,8 @@ $(DLL): $(DLL_OBJS) $(COMMON_OBJS) $(CC) $(LFLAGS) -o $(DLL) $(DLL_OBJS) $(COMMON_OBJS) $(LIBS) install: all - cp $(EXEC) $(DLL) $(OUTPUT_DIR) + cp $(EXEC) $(OUTPUT_DIR) + cp $(DLL) $(LIBRARY_DIR) rm -f $(EXEC) $(MAIN_OBJS) $(COMMON_OBJS) $(DLL_OBJS) clean: |