Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTomasz Zarna2008-09-01 15:01:25 +0000
committerTomasz Zarna2008-09-01 15:01:25 +0000
commitf9107ff7f1781926529876b1360131a03b994a88 (patch)
treed82b2470482fd3ca4b81dba0cf1beba81be13040 /bundles/org.eclipse.core.net
parent1e61bc87c49c33631321294b5311d61c961aae41 (diff)
downloadeclipse.platform.team-f9107ff7f1781926529876b1360131a03b994a88.tar.gz
eclipse.platform.team-f9107ff7f1781926529876b1360131a03b994a88.tar.xz
eclipse.platform.team-f9107ff7f1781926529876b1360131a03b994a88.zip
bug 245849: [Net] Native file getproxygnome.c doesn't match library name libproxygnome.so
Diffstat (limited to 'bundles/org.eclipse.core.net')
-rw-r--r--bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.linux.x86/build.properties2
-rw-r--r--bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.linux.x86/libgnomeproxy-1.0.0.so (renamed from bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.linux.x86/libproxygnome.so)bin91287 -> 91292 bytes
-rw-r--r--bundles/org.eclipse.core.net/natives/unix/GetProxyGnome/getproxygnome.d220
-rw-r--r--bundles/org.eclipse.core.net/natives/unix/GetProxyGnome/makefile43
-rw-r--r--bundles/org.eclipse.core.net/natives/unix/GetProxyGnome/objects.mk7
-rw-r--r--bundles/org.eclipse.core.net/natives/unix/GetProxyGnome/sources.mk17
-rw-r--r--bundles/org.eclipse.core.net/natives/unix/GetProxyGnome/subdir.mk24
-rw-r--r--bundles/org.eclipse.core.net/natives/unix/gnomeproxy.c (renamed from bundles/org.eclipse.core.net/natives/unix/getproxygnome.c)0
-rw-r--r--bundles/org.eclipse.core.net/natives/unix/linux/makefile45
-rw-r--r--bundles/org.eclipse.core.net/src/org/eclipse/core/internal/net/proxy/unix/UnixProxyProvider.java2
10 files changed, 47 insertions, 313 deletions
diff --git a/bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.linux.x86/build.properties b/bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.linux.x86/build.properties
index e75ccc1e0..a698f055e 100644
--- a/bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.linux.x86/build.properties
+++ b/bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.linux.x86/build.properties
@@ -13,7 +13,7 @@ bin.includes = fragment.properties,\
META-INF/,\
about.html,\
bin/,\
- libproxygnome.so
+ libgnomeproxy-1.0.0.so
src.includes = about.html
generateSourceBundle=false
source.. = src/
diff --git a/bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.linux.x86/libproxygnome.so b/bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.linux.x86/libgnomeproxy-1.0.0.so
index f0482426f..05e551e6a 100644
--- a/bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.linux.x86/libproxygnome.so
+++ b/bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.linux.x86/libgnomeproxy-1.0.0.so
Binary files differ
diff --git a/bundles/org.eclipse.core.net/natives/unix/GetProxyGnome/getproxygnome.d b/bundles/org.eclipse.core.net/natives/unix/GetProxyGnome/getproxygnome.d
deleted file mode 100644
index b8c3630c8..000000000
--- a/bundles/org.eclipse.core.net/natives/unix/GetProxyGnome/getproxygnome.d
+++ /dev/null
@@ -1,220 +0,0 @@
-getproxygnome.d getproxygnome.o: ../getproxygnome.c \
- /usr/include/glib-2.0/glib.h /usr/include/glib-2.0/glib/galloca.h \
- /usr/include/glib-2.0/glib/gtypes.h \
- /usr/lib/glib-2.0/include/glibconfig.h \
- /usr/include/glib-2.0/glib/gmacros.h \
- /usr/include/glib-2.0/glib/garray.h \
- /usr/include/glib-2.0/glib/gasyncqueue.h \
- /usr/include/glib-2.0/glib/gthread.h \
- /usr/include/glib-2.0/glib/gerror.h /usr/include/glib-2.0/glib/gquark.h \
- /usr/include/glib-2.0/glib/gatomic.h \
- /usr/include/glib-2.0/glib/gbacktrace.h \
- /usr/include/glib-2.0/glib/gbase64.h \
- /usr/include/glib-2.0/glib/gbookmarkfile.h \
- /usr/include/glib-2.0/glib/gcache.h /usr/include/glib-2.0/glib/glist.h \
- /usr/include/glib-2.0/glib/gmem.h /usr/include/glib-2.0/glib/gslice.h \
- /usr/include/glib-2.0/glib/gcompletion.h \
- /usr/include/glib-2.0/glib/gconvert.h \
- /usr/include/glib-2.0/glib/gdataset.h \
- /usr/include/glib-2.0/glib/gdate.h /usr/include/glib-2.0/glib/gdir.h \
- /usr/include/glib-2.0/glib/gfileutils.h \
- /usr/include/glib-2.0/glib/ghash.h /usr/include/glib-2.0/glib/ghook.h \
- /usr/include/glib-2.0/glib/giochannel.h \
- /usr/include/glib-2.0/glib/gmain.h /usr/include/glib-2.0/glib/gslist.h \
- /usr/include/glib-2.0/glib/gstring.h \
- /usr/include/glib-2.0/glib/gunicode.h \
- /usr/include/glib-2.0/glib/gutils.h \
- /usr/include/glib-2.0/glib/gkeyfile.h \
- /usr/include/glib-2.0/glib/gmappedfile.h \
- /usr/include/glib-2.0/glib/gmarkup.h \
- /usr/include/glib-2.0/glib/gmessages.h \
- /usr/include/glib-2.0/glib/gnode.h /usr/include/glib-2.0/glib/goption.h \
- /usr/include/glib-2.0/glib/gpattern.h \
- /usr/include/glib-2.0/glib/gprimes.h \
- /usr/include/glib-2.0/glib/gqsort.h /usr/include/glib-2.0/glib/gqueue.h \
- /usr/include/glib-2.0/glib/grand.h /usr/include/glib-2.0/glib/grel.h \
- /usr/include/glib-2.0/glib/gscanner.h \
- /usr/include/glib-2.0/glib/gshell.h /usr/include/glib-2.0/glib/gspawn.h \
- /usr/include/glib-2.0/glib/gstrfuncs.h \
- /usr/include/glib-2.0/glib/gthreadpool.h \
- /usr/include/glib-2.0/glib/gtimer.h /usr/include/glib-2.0/glib/gtree.h \
- /usr/include/gconf/2/gconf/gconf-value.h \
- /usr/include/gconf/2/gconf/gconf-error.h \
- /usr/include/gconf/2/gconf/gconf-client.h \
- /usr/include/glib-2.0/glib-object.h \
- /usr/include/glib-2.0/gobject/gboxed.h \
- /usr/include/glib-2.0/gobject/gtype.h \
- /usr/include/glib-2.0/gobject/genums.h \
- /usr/include/glib-2.0/gobject/gobject.h \
- /usr/include/glib-2.0/gobject/gvalue.h \
- /usr/include/glib-2.0/gobject/gparam.h \
- /usr/include/glib-2.0/gobject/gclosure.h \
- /usr/include/glib-2.0/gobject/gsignal.h \
- /usr/include/glib-2.0/gobject/gmarshal.h \
- /usr/include/glib-2.0/gobject/gparamspecs.h \
- /usr/include/glib-2.0/gobject/gsourceclosure.h \
- /usr/include/glib-2.0/gobject/gtypemodule.h \
- /usr/include/glib-2.0/gobject/gtypeplugin.h \
- /usr/include/glib-2.0/gobject/gvaluearray.h \
- /usr/include/glib-2.0/gobject/gvaluetypes.h \
- /usr/include/gconf/2/gconf/gconf.h \
- /usr/include/gconf/2/gconf/gconf-schema.h \
- /usr/include/gconf/2/gconf/gconf-engine.h \
- /usr/include/gconf/2/gconf/gconf-error.h \
- /usr/include/gconf/2/gconf/gconf-enum-types.h \
- /usr/include/gconf/2/gconf/gconf-listeners.h \
- /usr/include/gconf/2/gconf/gconf-changeset.h
-
-/usr/include/glib-2.0/glib.h:
-
-/usr/include/glib-2.0/glib/galloca.h:
-
-/usr/include/glib-2.0/glib/gtypes.h:
-
-/usr/lib/glib-2.0/include/glibconfig.h:
-
-/usr/include/glib-2.0/glib/gmacros.h:
-
-/usr/include/glib-2.0/glib/garray.h:
-
-/usr/include/glib-2.0/glib/gasyncqueue.h:
-
-/usr/include/glib-2.0/glib/gthread.h:
-
-/usr/include/glib-2.0/glib/gerror.h:
-
-/usr/include/glib-2.0/glib/gquark.h:
-
-/usr/include/glib-2.0/glib/gatomic.h:
-
-/usr/include/glib-2.0/glib/gbacktrace.h:
-
-/usr/include/glib-2.0/glib/gbase64.h:
-
-/usr/include/glib-2.0/glib/gbookmarkfile.h:
-
-/usr/include/glib-2.0/glib/gcache.h:
-
-/usr/include/glib-2.0/glib/glist.h:
-
-/usr/include/glib-2.0/glib/gmem.h:
-
-/usr/include/glib-2.0/glib/gslice.h:
-
-/usr/include/glib-2.0/glib/gcompletion.h:
-
-/usr/include/glib-2.0/glib/gconvert.h:
-
-/usr/include/glib-2.0/glib/gdataset.h:
-
-/usr/include/glib-2.0/glib/gdate.h:
-
-/usr/include/glib-2.0/glib/gdir.h:
-
-/usr/include/glib-2.0/glib/gfileutils.h:
-
-/usr/include/glib-2.0/glib/ghash.h:
-
-/usr/include/glib-2.0/glib/ghook.h:
-
-/usr/include/glib-2.0/glib/giochannel.h:
-
-/usr/include/glib-2.0/glib/gmain.h:
-
-/usr/include/glib-2.0/glib/gslist.h:
-
-/usr/include/glib-2.0/glib/gstring.h:
-
-/usr/include/glib-2.0/glib/gunicode.h:
-
-/usr/include/glib-2.0/glib/gutils.h:
-
-/usr/include/glib-2.0/glib/gkeyfile.h:
-
-/usr/include/glib-2.0/glib/gmappedfile.h:
-
-/usr/include/glib-2.0/glib/gmarkup.h:
-
-/usr/include/glib-2.0/glib/gmessages.h:
-
-/usr/include/glib-2.0/glib/gnode.h:
-
-/usr/include/glib-2.0/glib/goption.h:
-
-/usr/include/glib-2.0/glib/gpattern.h:
-
-/usr/include/glib-2.0/glib/gprimes.h:
-
-/usr/include/glib-2.0/glib/gqsort.h:
-
-/usr/include/glib-2.0/glib/gqueue.h:
-
-/usr/include/glib-2.0/glib/grand.h:
-
-/usr/include/glib-2.0/glib/grel.h:
-
-/usr/include/glib-2.0/glib/gscanner.h:
-
-/usr/include/glib-2.0/glib/gshell.h:
-
-/usr/include/glib-2.0/glib/gspawn.h:
-
-/usr/include/glib-2.0/glib/gstrfuncs.h:
-
-/usr/include/glib-2.0/glib/gthreadpool.h:
-
-/usr/include/glib-2.0/glib/gtimer.h:
-
-/usr/include/glib-2.0/glib/gtree.h:
-
-/usr/include/gconf/2/gconf/gconf-value.h:
-
-/usr/include/gconf/2/gconf/gconf-error.h:
-
-/usr/include/gconf/2/gconf/gconf-client.h:
-
-/usr/include/glib-2.0/glib-object.h:
-
-/usr/include/glib-2.0/gobject/gboxed.h:
-
-/usr/include/glib-2.0/gobject/gtype.h:
-
-/usr/include/glib-2.0/gobject/genums.h:
-
-/usr/include/glib-2.0/gobject/gobject.h:
-
-/usr/include/glib-2.0/gobject/gvalue.h:
-
-/usr/include/glib-2.0/gobject/gparam.h:
-
-/usr/include/glib-2.0/gobject/gclosure.h:
-
-/usr/include/glib-2.0/gobject/gsignal.h:
-
-/usr/include/glib-2.0/gobject/gmarshal.h:
-
-/usr/include/glib-2.0/gobject/gparamspecs.h:
-
-/usr/include/glib-2.0/gobject/gsourceclosure.h:
-
-/usr/include/glib-2.0/gobject/gtypemodule.h:
-
-/usr/include/glib-2.0/gobject/gtypeplugin.h:
-
-/usr/include/glib-2.0/gobject/gvaluearray.h:
-
-/usr/include/glib-2.0/gobject/gvaluetypes.h:
-
-/usr/include/gconf/2/gconf/gconf.h:
-
-/usr/include/gconf/2/gconf/gconf-schema.h:
-
-/usr/include/gconf/2/gconf/gconf-engine.h:
-
-/usr/include/gconf/2/gconf/gconf-error.h:
-
-/usr/include/gconf/2/gconf/gconf-enum-types.h:
-
-/usr/include/gconf/2/gconf/gconf-listeners.h:
-
-/usr/include/gconf/2/gconf/gconf-changeset.h:
diff --git a/bundles/org.eclipse.core.net/natives/unix/GetProxyGnome/makefile b/bundles/org.eclipse.core.net/natives/unix/GetProxyGnome/makefile
deleted file mode 100644
index a74fa321a..000000000
--- a/bundles/org.eclipse.core.net/natives/unix/GetProxyGnome/makefile
+++ /dev/null
@@ -1,43 +0,0 @@
-################################################################################
-# Automatically-generated file. Do not edit!
-################################################################################
-
--include ../makefile.init
-
-RM := rm -rf
-
-# All of the sources participating in the build are defined here
--include sources.mk
--include subdir.mk
--include objects.mk
-
-ifneq ($(MAKECMDGOALS),clean)
-ifneq ($(strip $(C_DEPS)),)
--include $(C_DEPS)
-endif
-endif
-
--include ../makefile.defs
-
-# Add inputs and outputs from these tool invocations to the build variables
-
-# All Target
-all: libproxygnome.so
-
-# Tool invocations
-libproxygnome.so: $(OBJS) $(USER_OBJS)
- @echo 'Building target: $@'
- @echo 'Invoking: GCC C Linker'
- gcc -m32 -shared -o"libproxygnome.so" $(OBJS) $(USER_OBJS) $(LIBS)
- @echo 'Finished building target: $@'
- @echo ' '
-
-# Other Targets
-clean:
- -$(RM) $(OBJS)$(C_DEPS)$(LIBRARIES) libproxygnome.so
- -@echo ' '
-
-.PHONY: all clean dependents
-.SECONDARY:
-
--include ../makefile.targets
diff --git a/bundles/org.eclipse.core.net/natives/unix/GetProxyGnome/objects.mk b/bundles/org.eclipse.core.net/natives/unix/GetProxyGnome/objects.mk
deleted file mode 100644
index a9828db0f..000000000
--- a/bundles/org.eclipse.core.net/natives/unix/GetProxyGnome/objects.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-################################################################################
-# Automatically-generated file. Do not edit!
-################################################################################
-
-USER_OBJS :=
-
-LIBS := -lgconf-2 -lORBit-2 -lgthread-2.0 -lrt -lgobject-2.0 -lglib-2.0
diff --git a/bundles/org.eclipse.core.net/natives/unix/GetProxyGnome/sources.mk b/bundles/org.eclipse.core.net/natives/unix/GetProxyGnome/sources.mk
deleted file mode 100644
index 2b71575c4..000000000
--- a/bundles/org.eclipse.core.net/natives/unix/GetProxyGnome/sources.mk
+++ /dev/null
@@ -1,17 +0,0 @@
-################################################################################
-# Automatically-generated file. Do not edit!
-################################################################################
-
-O_SRCS :=
-C_SRCS :=
-S_SRCS :=
-OBJ_SRCS :=
-ASM_SRCS :=
-OBJS :=
-C_DEPS :=
-LIBRARIES :=
-
-# Every subdirectory with source files must be described here
-SUBDIRS := \
-. \
-
diff --git a/bundles/org.eclipse.core.net/natives/unix/GetProxyGnome/subdir.mk b/bundles/org.eclipse.core.net/natives/unix/GetProxyGnome/subdir.mk
deleted file mode 100644
index d4d2e6854..000000000
--- a/bundles/org.eclipse.core.net/natives/unix/GetProxyGnome/subdir.mk
+++ /dev/null
@@ -1,24 +0,0 @@
-################################################################################
-# Automatically-generated file. Do not edit!
-################################################################################
-
-# Add inputs and outputs from these tool invocations to the build variables
-C_SRCS += \
-../getproxygnome.c
-
-OBJS += \
-./getproxygnome.o
-
-C_DEPS += \
-./getproxygnome.d
-
-
-# Each subdirectory must supply rules for building sources it contributes
-%.o: ../%.c
- @echo 'Building file: $<'
- @echo 'Invoking: GCC C Compiler'
- gcc -I/usr/include/gconf/2 -I/usr/include/orbit-2.0 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include/ -O0 -fPIC -g3 -Wall -c -fmessage-length=0 -m32 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@:%.o=%.d)" -o"$@" "$<"
- @echo 'Finished building: $<'
- @echo ' '
-
-
diff --git a/bundles/org.eclipse.core.net/natives/unix/getproxygnome.c b/bundles/org.eclipse.core.net/natives/unix/gnomeproxy.c
index 1811952bf..1811952bf 100644
--- a/bundles/org.eclipse.core.net/natives/unix/getproxygnome.c
+++ b/bundles/org.eclipse.core.net/natives/unix/gnomeproxy.c
diff --git a/bundles/org.eclipse.core.net/natives/unix/linux/makefile b/bundles/org.eclipse.core.net/natives/unix/linux/makefile
new file mode 100644
index 000000000..daab01dff
--- /dev/null
+++ b/bundles/org.eclipse.core.net/natives/unix/linux/makefile
@@ -0,0 +1,45 @@
+#**********************************************************************
+# Copyright (c) 2008 Oakland Software Incorporated and others.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+#
+# Contributors:
+# Oakland Software Incorporated - initial submission
+# IBM Corporation - refactoring, bug 245849
+#
+#**********************************************************************
+#
+# makefile for libgnomeproxy-1.0.0.so
+
+GNOMEPROXY.C = ../gnomeproxy.c
+GNOMEPROXY.O = gnomeproxy.o
+LIB_NAME = gnomeproxy.so
+LIB_NAME_FULL = libgnomeproxy-1.0.0.so
+
+INCLUDE = -I/usr/include/gconf/2/ -I/usr/include/orbit-2.0/ -I/usr/include/glib-2.0/ -I/usr/lib/glib-2.0/include/
+COMPILER_FLAGS= -O0 -fPIC -g3 -Wall -c -fmessage-length=0 -m32
+
+LIBS := -lgconf-2 -lORBit-2 -lgthread-2.0 -lrt -lgobject-2.0 -lglib-2.0
+LINKER_FLAGS= -m32
+
+all: link
+
+compile:
+ @echo "Building file: $(GNOMEPROXY.O)"
+ @echo "Invoking: GCC C Compiler"
+ gcc $(INCLUDE) $(COMPILER_FLAGS) -o $(GNOMEPROXY.O) $(GNOMEPROXY.C)
+ @echo "Finished building: $(GNOMEPROXY.O)"
+ @echo " "
+
+link: compile
+ @echo "Building target: $(LIB_NAME_FULL)"
+ @echo "Invoking: GCC C Linker"
+ gcc $(LINKER_FLAGS) -shared -Wl,-soname,$(LIB_NAME) -o $(LIB_NAME_FULL) $(LIBS) $(GNOMEPROXY.O) -lc
+ @echo "Finished building target: $(LIB_NAME_FULL)"
+ @echo " "
+
+clean:
+ -$(RM) $(GNOMEPROXY.O) $(LIB_NAME_FULL)
+ -@echo " "
diff --git a/bundles/org.eclipse.core.net/src/org/eclipse/core/internal/net/proxy/unix/UnixProxyProvider.java b/bundles/org.eclipse.core.net/src/org/eclipse/core/internal/net/proxy/unix/UnixProxyProvider.java
index f4af5bb9b..c2f2389e8 100644
--- a/bundles/org.eclipse.core.net/src/org/eclipse/core/internal/net/proxy/unix/UnixProxyProvider.java
+++ b/bundles/org.eclipse.core.net/src/org/eclipse/core/internal/net/proxy/unix/UnixProxyProvider.java
@@ -26,7 +26,7 @@ public class UnixProxyProvider extends AbstractProxyProvider {
private static final String LIBRARY_GCONF2 = "gconf-2"; //$NON-NLS-1$
- private static final String LIBRARY_NAME = "proxygnome"; //$NON-NLS-1$
+ private static final String LIBRARY_NAME = "gnomeproxy-1.0.0"; //$NON-NLS-1$
private static boolean isGnomeLibLoaded = false;

Back to the top