You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@harmony.apache.org by te...@apache.org on 2009/10/06 16:57:51 UTC
svn commit: r822302 [1/5] - in /harmony/enhanced/classlib/branches/java6: ./
depends/build/ depends/build/platform/ depends/files/
depends/libs/windows.x86/ depends/oss/ make/ modules/accessibility/
modules/annotation/ modules/annotation/make/ modules/...
Author: tellison
Date: Tue Oct 6 14:57:42 2009
New Revision: 822302
URL: http://svn.apache.org/viewvc?rev=822302&view=rev
Log:
Merge updates between classlib trunk@r814488 and r822279
Added:
harmony/enhanced/classlib/branches/java6/modules/annotation/make/findbugs-exclude-filter.xml
- copied unchanged from r822279, harmony/enhanced/classlib/trunk/modules/annotation/make/findbugs-exclude-filter.xml
harmony/enhanced/classlib/branches/java6/modules/archive/make/findbugs-exclude-filter.xml
- copied unchanged from r822279, harmony/enhanced/classlib/trunk/modules/archive/make/findbugs-exclude-filter.xml
harmony/enhanced/classlib/branches/java6/modules/beans/make/findbugs-exclude-filter.xml
- copied unchanged from r822279, harmony/enhanced/classlib/trunk/modules/beans/make/findbugs-exclude-filter.xml
harmony/enhanced/classlib/branches/java6/modules/instrument/make/findbugs-exclude-filter.xml
- copied unchanged from r822279, harmony/enhanced/classlib/trunk/modules/instrument/make/findbugs-exclude-filter.xml
harmony/enhanced/classlib/branches/java6/modules/luni/make/findbugs-exclude-filter.xml
- copied unchanged from r822279, harmony/enhanced/classlib/trunk/modules/luni/make/findbugs-exclude-filter.xml
harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/org/apache/harmony/luni/internal/net/www/protocol/http/HttpURLConnectionImpl.java
- copied unchanged from r822279, harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/internal/net/www/protocol/http/HttpURLConnectionImpl.java
harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/org/apache/harmony/luni/internal/net/www/protocol/https/HttpsURLConnectionImpl.java
- copied unchanged from r822279, harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/internal/net/www/protocol/https/HttpsURLConnectionImpl.java
harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/org/apache/harmony/luni/internal/net/www/protocol/jar/JarURLConnectionImpl.java
- copied unchanged from r822279, harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/internal/net/www/protocol/jar/JarURLConnectionImpl.java
harmony/enhanced/classlib/branches/java6/modules/nio/make/findbugs-exclude-filter.xml
- copied unchanged from r822279, harmony/enhanced/classlib/trunk/modules/nio/make/findbugs-exclude-filter.xml
harmony/enhanced/classlib/branches/java6/modules/prefs/make/findbugs-exclude-filter.xml
- copied unchanged from r822279, harmony/enhanced/classlib/trunk/modules/prefs/make/findbugs-exclude-filter.xml
harmony/enhanced/classlib/branches/java6/modules/security/make/findbugs-exclude-filter.xml
- copied unchanged from r822279, harmony/enhanced/classlib/trunk/modules/security/make/findbugs-exclude-filter.xml
harmony/enhanced/classlib/branches/java6/modules/sql/make/findbugs-exclude-filter.xml
- copied unchanged from r822279, harmony/enhanced/classlib/trunk/modules/sql/make/findbugs-exclude-filter.xml
harmony/enhanced/classlib/branches/java6/modules/sql/src/test/java/org/apache/harmony/sql/tests/internal/rowset/SyncFactoryTest.java
- copied unchanged from r822279, harmony/enhanced/classlib/trunk/modules/sql/src/test/java/org/apache/harmony/sql/tests/internal/rowset/SyncFactoryTest.java
Removed:
harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/org/apache/harmony/luni/internal/net/www/protocol/http/HttpURLConnection.java
harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/org/apache/harmony/luni/internal/net/www/protocol/https/HttpsURLConnection.java
harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/org/apache/harmony/luni/internal/net/www/protocol/jar/JarURLConnection.java
harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/org/apache/harmony/luni/platform/OSResourcesMonitor.java
harmony/enhanced/classlib/branches/java6/modules/luni/src/main/native/luni/shared/OSResourcesMonitor.h
harmony/enhanced/classlib/branches/java6/modules/luni/src/main/native/luni/unix/aix/
harmony/enhanced/classlib/branches/java6/modules/luni/src/main/native/luni/unix/freebsd/
harmony/enhanced/classlib/branches/java6/modules/luni/src/main/native/luni/unix/linux/
harmony/enhanced/classlib/branches/java6/modules/luni/src/main/native/luni/unix/macosx/
harmony/enhanced/classlib/branches/java6/modules/luni/src/main/native/luni/unix/zos/
harmony/enhanced/classlib/branches/java6/modules/luni/src/main/native/luni/windows/OSResourcesMonitorWin32.c
harmony/enhanced/classlib/branches/java6/modules/nio/src/main/java/common/java/nio/DirectByteBuffers.java
Modified:
harmony/enhanced/classlib/branches/java6/ (props changed)
harmony/enhanced/classlib/branches/java6/build.xml
harmony/enhanced/classlib/branches/java6/depends/build/defines.mak
harmony/enhanced/classlib/branches/java6/depends/build/defines.mk
harmony/enhanced/classlib/branches/java6/depends/build/platform/linux.ia64.mk
harmony/enhanced/classlib/branches/java6/depends/build/platform/linux.ppc32.mk
harmony/enhanced/classlib/branches/java6/depends/build/platform/linux.ppc64.mk
harmony/enhanced/classlib/branches/java6/depends/build/platform/linux.s390.mk
harmony/enhanced/classlib/branches/java6/depends/build/platform/linux.s390x.mk
harmony/enhanced/classlib/branches/java6/depends/build/platform/linux.x86.mk
harmony/enhanced/classlib/branches/java6/depends/build/platform/linux.x86_64.mk
harmony/enhanced/classlib/branches/java6/depends/build/rules.mak
harmony/enhanced/classlib/branches/java6/depends/build/rules.mk
harmony/enhanced/classlib/branches/java6/depends/files/rowset.properties
harmony/enhanced/classlib/branches/java6/depends/libs/windows.x86/ (props changed)
harmony/enhanced/classlib/branches/java6/depends/oss/ (props changed)
harmony/enhanced/classlib/branches/java6/make/build-test.xml
harmony/enhanced/classlib/branches/java6/make/depends-common.xml (props changed)
harmony/enhanced/classlib/branches/java6/make/depends.properties
harmony/enhanced/classlib/branches/java6/make/depends.xml
harmony/enhanced/classlib/branches/java6/make/properties.xml
harmony/enhanced/classlib/branches/java6/modules/accessibility/build.xml
harmony/enhanced/classlib/branches/java6/modules/annotation/build.xml
harmony/enhanced/classlib/branches/java6/modules/annotation/src/main/java/java/lang/annotation/Retention.java
harmony/enhanced/classlib/branches/java6/modules/annotation/src/main/java/java/lang/annotation/Target.java
harmony/enhanced/classlib/branches/java6/modules/applet/build.xml
harmony/enhanced/classlib/branches/java6/modules/archive/build.xml
harmony/enhanced/classlib/branches/java6/modules/archive/src/main/java/java/util/zip/Deflater.java
harmony/enhanced/classlib/branches/java6/modules/archive/src/main/native/archive/ (props changed)
harmony/enhanced/classlib/branches/java6/modules/archive/src/main/native/archive/unix/makefile
harmony/enhanced/classlib/branches/java6/modules/archive/src/main/native/archive/windows/makefile
harmony/enhanced/classlib/branches/java6/modules/archive/src/main/native/zlib/ (props changed)
harmony/enhanced/classlib/branches/java6/modules/archive/src/main/native/zlib/unix/makefile
harmony/enhanced/classlib/branches/java6/modules/archive/src/main/native/zlib/windows/makefile
harmony/enhanced/classlib/branches/java6/modules/auth/build.xml
harmony/enhanced/classlib/branches/java6/modules/auth/src/main/native/auth/ (props changed)
harmony/enhanced/classlib/branches/java6/modules/auth/src/main/native/auth/unix/makefile
harmony/enhanced/classlib/branches/java6/modules/auth/src/main/native/auth/windows/makefile
harmony/enhanced/classlib/branches/java6/modules/awt/build.xml
harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/fontlib/ (props changed)
harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/fontlib/unix/makefile
harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/fontlib/windows/makefile
harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/gl/ (props changed)
harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/gl/unix/makefile
harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/gl/windows/makefile
harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/jpegdecoder/ (props changed)
harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/jpegdecoder/unix/makefile
harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/jpegdecoder/windows/makefile
harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/lcmm/ (props changed)
harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/lcmm/unix/makefile
harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/lcmm/windows/makefile
harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/linuxfont/ (props changed)
harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/linuxfont/unix/makefile
harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/oglwrapper/ (props changed)
harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/oglwrapper/unix/makefile
harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/oglwrapper/windows/makefile
harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/win32wrapper/ (props changed)
harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/win32wrapper/windows/makefile
harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/winfont/ (props changed)
harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/winfont/windows/makefile
harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/x11wrapper/ (props changed)
harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/x11wrapper/unix/makefile
harmony/enhanced/classlib/branches/java6/modules/beans/build.xml
harmony/enhanced/classlib/branches/java6/modules/beans/make/exclude.common
harmony/enhanced/classlib/branches/java6/modules/beans/src/main/java/java/beans/ArrayPersistenceDelegate.java
harmony/enhanced/classlib/branches/java6/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/XMLEncoderTest.java
harmony/enhanced/classlib/branches/java6/modules/beans/src/test/resources/xml/MockBean4Codec_ManyChanges.xml
harmony/enhanced/classlib/branches/java6/modules/beans/src/test/resources/xml/MockBean4Codec_ManyChanges_2.xml
harmony/enhanced/classlib/branches/java6/modules/concurrent/build.xml
harmony/enhanced/classlib/branches/java6/modules/concurrent/src/main/java/java/util/concurrent/atomic/ (props changed)
harmony/enhanced/classlib/branches/java6/modules/concurrent/src/main/java/java/util/concurrent/locks/ (props changed)
harmony/enhanced/classlib/branches/java6/modules/crypto/build.xml
harmony/enhanced/classlib/branches/java6/modules/imageio/build.xml
harmony/enhanced/classlib/branches/java6/modules/imageio/src/main/native/jpegencoder/ (props changed)
harmony/enhanced/classlib/branches/java6/modules/imageio/src/main/native/jpegencoder/unix/makefile
harmony/enhanced/classlib/branches/java6/modules/imageio/src/main/native/jpegencoder/windows/makefile
harmony/enhanced/classlib/branches/java6/modules/imageio/src/main/native/pngencoder/ (props changed)
harmony/enhanced/classlib/branches/java6/modules/imageio/src/main/native/pngencoder/unix/makefile
harmony/enhanced/classlib/branches/java6/modules/imageio/src/main/native/pngencoder/windows/makefile
harmony/enhanced/classlib/branches/java6/modules/instrument/build.xml
harmony/enhanced/classlib/branches/java6/modules/instrument/src/main/native/instrument/ (props changed)
harmony/enhanced/classlib/branches/java6/modules/instrument/src/main/native/instrument/unix/makefile
harmony/enhanced/classlib/branches/java6/modules/instrument/src/main/native/instrument/windows/makefile
harmony/enhanced/classlib/branches/java6/modules/jmx/META-INF/ (props changed)
harmony/enhanced/classlib/branches/java6/modules/jndi/build.xml
harmony/enhanced/classlib/branches/java6/modules/jndi/src/main/java/javax/naming/InitialContext.java
harmony/enhanced/classlib/branches/java6/modules/jndi/src/main/java/org/apache/harmony/jndi/provider/GenericURLContext.java
harmony/enhanced/classlib/branches/java6/modules/jndi/src/main/java/org/apache/harmony/jndi/provider/dns/DNSContext.java
harmony/enhanced/classlib/branches/java6/modules/lang-management/build.xml
harmony/enhanced/classlib/branches/java6/modules/lang-management/src/test/api/java/org/apache/harmony/lang/management/tests/java/util/logging/ (props changed)
harmony/enhanced/classlib/branches/java6/modules/logging/build.xml
harmony/enhanced/classlib/branches/java6/modules/luni/build.xml
harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/io/EmulatedFieldsForDumping.java
harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/io/File.java
harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/io/FileInputStream.java
harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/io/InputStream.java
harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/lang/Enum.java
harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/lang/Integer.java
harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/lang/Math.java
harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/lang/SecurityManager.java
harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/net/InetAddress.java
harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/net/JarURLConnection.java
harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/net/NetworkInterface.java
harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/net/SocketAddress.java
harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/net/URL.java
harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/net/URLClassLoader.java
harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/util/GregorianCalendar.java
harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/util/UnknownFormatFlagsException.java
harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/org/apache/harmony/luni/internal/net/www/protocol/http/Handler.java
harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/org/apache/harmony/luni/internal/net/www/protocol/https/Handler.java
harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/org/apache/harmony/luni/internal/net/www/protocol/jar/Handler.java
harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/org/apache/harmony/luni/internal/reflect/ProxyNameAndTypeCache.java
harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/org/apache/harmony/luni/platform/INetworkSystem.java
harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/org/apache/harmony/luni/platform/OSMemory.java
harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/org/apache/harmony/luni/platform/OSNetworkSystem.java
harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/org/apache/harmony/luni/platform/PlatformAddressFactory.java
harmony/enhanced/classlib/branches/java6/modules/luni/src/main/native/include/fdlibm.h (props changed)
harmony/enhanced/classlib/branches/java6/modules/luni/src/main/native/include/gp.h (props changed)
harmony/enhanced/classlib/branches/java6/modules/luni/src/main/native/include/hymagic.h (props changed)
harmony/enhanced/classlib/branches/java6/modules/luni/src/main/native/include/hysocket.h (props changed)
harmony/enhanced/classlib/branches/java6/modules/luni/src/main/native/include/hyvmls.h (props changed)
harmony/enhanced/classlib/branches/java6/modules/luni/src/main/native/include/jni.h (props changed)
harmony/enhanced/classlib/branches/java6/modules/luni/src/main/native/include/jni_types.h (props changed)
harmony/enhanced/classlib/branches/java6/modules/luni/src/main/native/include/jvmpi.h (props changed)
harmony/enhanced/classlib/branches/java6/modules/luni/src/main/native/include/jvmri.h (props changed)
harmony/enhanced/classlib/branches/java6/modules/luni/src/main/native/include/jvmti.h (props changed)
harmony/enhanced/classlib/branches/java6/modules/luni/src/main/native/include/jvmti_types.h (props changed)
harmony/enhanced/classlib/branches/java6/modules/luni/src/main/native/include/vmi.h (props changed)
harmony/enhanced/classlib/branches/java6/modules/luni/src/main/native/include/vmizip.h (props changed)
harmony/enhanced/classlib/branches/java6/modules/luni/src/main/native/launcher/ (props changed)
harmony/enhanced/classlib/branches/java6/modules/luni/src/main/native/launcher/shared/main.c
harmony/enhanced/classlib/branches/java6/modules/luni/src/main/native/launcher/windows/makefile.javae
harmony/enhanced/classlib/branches/java6/modules/luni/src/main/native/launcher/windows/makefile.javaw
harmony/enhanced/classlib/branches/java6/modules/luni/src/main/native/luni/ (props changed)
harmony/enhanced/classlib/branches/java6/modules/luni/src/main/native/luni/shared/OSMemory.c
harmony/enhanced/classlib/branches/java6/modules/luni/src/main/native/luni/shared/OSMemory.h
harmony/enhanced/classlib/branches/java6/modules/luni/src/main/native/luni/shared/OSNetworkSystem.h
harmony/enhanced/classlib/branches/java6/modules/luni/src/main/native/luni/shared/file.c
harmony/enhanced/classlib/branches/java6/modules/luni/src/main/native/luni/shared/harmonyglob.h
harmony/enhanced/classlib/branches/java6/modules/luni/src/main/native/luni/shared/nethelp.c
harmony/enhanced/classlib/branches/java6/modules/luni/src/main/native/luni/shared/netif.c
harmony/enhanced/classlib/branches/java6/modules/luni/src/main/native/luni/unix/OSMemoryLinux32.c
harmony/enhanced/classlib/branches/java6/modules/luni/src/main/native/luni/unix/OSNetworkSystemLinux.c
harmony/enhanced/classlib/branches/java6/modules/luni/src/main/native/luni/unix/exports.txt
harmony/enhanced/classlib/branches/java6/modules/luni/src/main/native/luni/unix/helpers.c
harmony/enhanced/classlib/branches/java6/modules/luni/src/main/native/luni/unix/helpers.h
harmony/enhanced/classlib/branches/java6/modules/luni/src/main/native/luni/unix/makefile
harmony/enhanced/classlib/branches/java6/modules/luni/src/main/native/luni/windows/OSNetworkSystemWin32.c
harmony/enhanced/classlib/branches/java6/modules/luni/src/main/native/luni/windows/helpers.c
harmony/enhanced/classlib/branches/java6/modules/luni/src/main/native/luni/windows/helpers.h
harmony/enhanced/classlib/branches/java6/modules/luni/src/main/native/luni/windows/makefile
harmony/enhanced/classlib/branches/java6/modules/luni/src/main/native/vmi/ (props changed)
harmony/enhanced/classlib/branches/java6/modules/luni/src/main/native/vmi/unix/makefile
harmony/enhanced/classlib/branches/java6/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/io/FileTest.java
harmony/enhanced/classlib/branches/java6/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/lang/MathTest.java
harmony/enhanced/classlib/branches/java6/modules/luni/src/test/resources/net.resources/ (props changed)
harmony/enhanced/classlib/branches/java6/modules/math/build.xml
harmony/enhanced/classlib/branches/java6/modules/misc/build.xml
harmony/enhanced/classlib/branches/java6/modules/misc/src/main/native/accessors/ (props changed)
harmony/enhanced/classlib/branches/java6/modules/misc/src/main/native/accessors/shared/org_apache_harmony_misc_accessors_ArrayAccessorImpl.c
harmony/enhanced/classlib/branches/java6/modules/misc/src/main/native/accessors/unix/makefile
harmony/enhanced/classlib/branches/java6/modules/misc/src/main/native/accessors/windows/makefile
harmony/enhanced/classlib/branches/java6/modules/nio/build.xml
harmony/enhanced/classlib/branches/java6/modules/nio/src/main/java/common/org/apache/harmony/nio/internal/SelectionKeyImpl.java
harmony/enhanced/classlib/branches/java6/modules/nio/src/main/java/common/org/apache/harmony/nio/internal/SelectorImpl.java
harmony/enhanced/classlib/branches/java6/modules/nio/src/main/java/common/org/apache/harmony/nio/internal/SocketChannelImpl.java
harmony/enhanced/classlib/branches/java6/modules/nio/src/main/native/nio/ (props changed)
harmony/enhanced/classlib/branches/java6/modules/nio/src/main/native/nio/unix/makefile
harmony/enhanced/classlib/branches/java6/modules/nio/src/main/native/nio/windows/makefile
harmony/enhanced/classlib/branches/java6/modules/nio/src/test/java/common/org/apache/harmony/nio/tests/java/nio/MappedByteBufferTest.java
harmony/enhanced/classlib/branches/java6/modules/nio/src/test/java/common/org/apache/harmony/nio/tests/java/nio/channels/SocketChannelTest.java
harmony/enhanced/classlib/branches/java6/modules/nio_char/build.xml
harmony/enhanced/classlib/branches/java6/modules/nio_char/src/main/native/niochar/ (props changed)
harmony/enhanced/classlib/branches/java6/modules/nio_char/src/main/native/niochar/unix/makefile
harmony/enhanced/classlib/branches/java6/modules/nio_char/src/main/native/niochar/windows/makefile
harmony/enhanced/classlib/branches/java6/modules/pack200/build.xml
harmony/enhanced/classlib/branches/java6/modules/pack200/depends/manifests/asm-3.1/ (props changed)
harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/ExceptionsAttribute.java
harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java5/org/apache/harmony/pack200/Pack200Adapter.java (props changed)
harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java5/org/apache/harmony/pack200/Pack200PackerAdapter.java (props changed)
harmony/enhanced/classlib/branches/java6/modules/portlib/build.xml
harmony/enhanced/classlib/branches/java6/modules/portlib/src/main/native/a2e/unix/headers/stdio.h
harmony/enhanced/classlib/branches/java6/modules/portlib/src/main/native/a2e/unix/makefile
harmony/enhanced/classlib/branches/java6/modules/portlib/src/main/native/port/ (props changed)
harmony/enhanced/classlib/branches/java6/modules/portlib/src/main/native/port/unix/makefile
harmony/enhanced/classlib/branches/java6/modules/portlib/src/main/native/port/windows/makefile
harmony/enhanced/classlib/branches/java6/modules/portlib/src/main/native/thread/ (props changed)
harmony/enhanced/classlib/branches/java6/modules/portlib/src/main/native/thread/unix/makefile
harmony/enhanced/classlib/branches/java6/modules/portlib/src/main/native/thrstub/ (props changed)
harmony/enhanced/classlib/branches/java6/modules/portlib/src/main/native/thrstub/unix/makefile
harmony/enhanced/classlib/branches/java6/modules/portlib/src/main/native/thrstub/windows/makefile
harmony/enhanced/classlib/branches/java6/modules/prefs/build.xml
harmony/enhanced/classlib/branches/java6/modules/prefs/src/main/java/java/util/prefs/AbstractPreferences.java
harmony/enhanced/classlib/branches/java6/modules/prefs/src/main/java/java/util/prefs/BackingStoreException.java
harmony/enhanced/classlib/branches/java6/modules/prefs/src/main/java/java/util/prefs/FilePreferencesFactoryImpl.java
harmony/enhanced/classlib/branches/java6/modules/prefs/src/main/java/java/util/prefs/FilePreferencesImpl.java
harmony/enhanced/classlib/branches/java6/modules/prefs/src/main/java/java/util/prefs/InvalidPreferencesFormatException.java
harmony/enhanced/classlib/branches/java6/modules/prefs/src/main/java/java/util/prefs/NodeChangeEvent.java
harmony/enhanced/classlib/branches/java6/modules/prefs/src/main/java/java/util/prefs/NodeChangeListener.java
harmony/enhanced/classlib/branches/java6/modules/prefs/src/main/java/java/util/prefs/PreferenceChangeEvent.java
harmony/enhanced/classlib/branches/java6/modules/prefs/src/main/java/java/util/prefs/PreferenceChangeListener.java
harmony/enhanced/classlib/branches/java6/modules/prefs/src/main/java/java/util/prefs/Preferences.java
harmony/enhanced/classlib/branches/java6/modules/prefs/src/main/java/java/util/prefs/PreferencesFactory.java
harmony/enhanced/classlib/branches/java6/modules/prefs/src/main/java/java/util/prefs/RegistryPreferencesFactoryImpl.java
harmony/enhanced/classlib/branches/java6/modules/prefs/src/main/java/java/util/prefs/RegistryPreferencesImpl.java
harmony/enhanced/classlib/branches/java6/modules/prefs/src/main/java/java/util/prefs/XMLParser.java
harmony/enhanced/classlib/branches/java6/modules/prefs/src/main/java/org/apache/harmony/prefs/internal/nls/messages.properties
harmony/enhanced/classlib/branches/java6/modules/prefs/src/main/native/prefs/ (props changed)
harmony/enhanced/classlib/branches/java6/modules/prefs/src/main/native/prefs/windows/makefile
harmony/enhanced/classlib/branches/java6/modules/print/build.xml
harmony/enhanced/classlib/branches/java6/modules/print/src/main/native/print/ (props changed)
harmony/enhanced/classlib/branches/java6/modules/print/src/main/native/print/windows/makefile
harmony/enhanced/classlib/branches/java6/modules/regex/build.xml
harmony/enhanced/classlib/branches/java6/modules/rmi/build.xml
harmony/enhanced/classlib/branches/java6/modules/security/build.xml
harmony/enhanced/classlib/branches/java6/modules/security/src/main/java/common/java/security/AlgorithmParameters.java
harmony/enhanced/classlib/branches/java6/modules/security/src/main/java/common/java/security/AllPermission.java
harmony/enhanced/classlib/branches/java6/modules/security/src/main/java/common/java/security/AllPermissionCollection.java
harmony/enhanced/classlib/branches/java6/modules/security/src/main/java/common/java/security/BasicPermission.java
harmony/enhanced/classlib/branches/java6/modules/security/src/main/java/common/java/security/BasicPermissionCollection.java
harmony/enhanced/classlib/branches/java6/modules/security/src/main/java/common/java/security/CodeSigner.java
harmony/enhanced/classlib/branches/java6/modules/security/src/main/java/common/java/security/CodeSource.java
harmony/enhanced/classlib/branches/java6/modules/security/src/main/java/common/java/security/DigestInputStream.java
harmony/enhanced/classlib/branches/java6/modules/security/src/main/java/common/java/security/DigestOutputStream.java
harmony/enhanced/classlib/branches/java6/modules/security/src/main/java/common/java/security/Identity.java
harmony/enhanced/classlib/branches/java6/modules/security/src/main/java/common/java/security/IdentityScope.java
harmony/enhanced/classlib/branches/java6/modules/security/src/main/java/common/java/security/KeyFactory.java
harmony/enhanced/classlib/branches/java6/modules/security/src/main/java/common/java/security/KeyPairGenerator.java
harmony/enhanced/classlib/branches/java6/modules/security/src/main/java/common/java/security/KeyStore.java
harmony/enhanced/classlib/branches/java6/modules/security/src/main/java/common/java/security/MessageDigest.java
harmony/enhanced/classlib/branches/java6/modules/security/src/main/java/common/java/security/MessageDigestSpi.java
harmony/enhanced/classlib/branches/java6/modules/security/src/main/java/common/java/security/Permission.java
harmony/enhanced/classlib/branches/java6/modules/security/src/main/java/common/java/security/PermissionCollection.java
harmony/enhanced/classlib/branches/java6/modules/security/src/main/java/common/java/security/PrivilegedActionException.java
harmony/enhanced/classlib/branches/java6/modules/security/src/main/java/common/java/security/ProtectionDomain.java
harmony/enhanced/classlib/branches/java6/modules/security/src/main/java/common/java/security/Provider.java
harmony/enhanced/classlib/branches/java6/modules/security/src/main/java/common/java/security/SecureClassLoader.java
harmony/enhanced/classlib/branches/java6/modules/security/src/main/java/common/java/security/SecureRandom.java
harmony/enhanced/classlib/branches/java6/modules/security/src/main/java/common/java/security/Security.java
harmony/enhanced/classlib/branches/java6/modules/security/src/main/java/common/java/security/Signature.java
harmony/enhanced/classlib/branches/java6/modules/security/src/main/java/common/java/security/SignatureSpi.java
harmony/enhanced/classlib/branches/java6/modules/security/src/main/java/common/java/security/Signer.java
harmony/enhanced/classlib/branches/java6/modules/security/src/main/java/common/java/security/Timestamp.java
harmony/enhanced/classlib/branches/java6/modules/security/src/main/java/common/java/security/UnresolvedPermission.java
harmony/enhanced/classlib/branches/java6/modules/security/src/main/native/security/ (props changed)
harmony/enhanced/classlib/branches/java6/modules/security/src/main/native/security/unix/makefile
harmony/enhanced/classlib/branches/java6/modules/security/src/main/native/security/windows/makefile
harmony/enhanced/classlib/branches/java6/modules/sound/build.xml
harmony/enhanced/classlib/branches/java6/modules/sql/build.xml
harmony/enhanced/classlib/branches/java6/modules/sql/src/main/java/java/sql/Date.java
harmony/enhanced/classlib/branches/java6/modules/sql/src/main/java/java/sql/ResultSet.java
harmony/enhanced/classlib/branches/java6/modules/sql/src/main/java/java/sql/Time.java
harmony/enhanced/classlib/branches/java6/modules/sql/src/main/java/java/sql/Timestamp.java
harmony/enhanced/classlib/branches/java6/modules/sql/src/main/java/javax/sql/rowset/spi/SyncFactory.java
harmony/enhanced/classlib/branches/java6/modules/sql/src/main/java/javax/sql/rowset/spi/SyncProvider.java
harmony/enhanced/classlib/branches/java6/modules/suncompat/build.xml
harmony/enhanced/classlib/branches/java6/modules/swing/build.xml
harmony/enhanced/classlib/branches/java6/modules/swing/src/test/api/java.injected/javax/swing/BasicSwingTestCase.java (props changed)
harmony/enhanced/classlib/branches/java6/modules/swing/src/test/api/java.injected/javax/swing/SwingTestCase.java (props changed)
harmony/enhanced/classlib/branches/java6/modules/swing/src/test/api/java.injected/javax/swing/text/parser/ (props changed)
harmony/enhanced/classlib/branches/java6/modules/text/build.xml
harmony/enhanced/classlib/branches/java6/modules/x-net/build.xml
harmony/enhanced/classlib/branches/java6/modules/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/CipherSuite.java
harmony/enhanced/classlib/branches/java6/modules/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/Finished.java
harmony/enhanced/classlib/branches/java6/modules/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/ProtocolVersion.java
harmony/enhanced/classlib/branches/java6/modules/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/SSLInputStream.java
harmony/enhanced/classlib/branches/java6/modules/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/SSLSessionContextImpl.java
Propchange: harmony/enhanced/classlib/branches/java6/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Oct 6 14:57:42 2009
@@ -1 +1 @@
-/harmony/enhanced/classlib/trunk:713674-735919,765923-814402
+/harmony/enhanced/classlib/trunk:713674-735919,765923-822279
Modified: harmony/enhanced/classlib/branches/java6/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/build.xml?rev=822302&r1=822301&r2=822302&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/build.xml (original)
+++ harmony/enhanced/classlib/branches/java6/build.xml Tue Oct 6 14:57:42 2009
@@ -191,6 +191,16 @@
<ant antfile="make/build-test.xml" inheritall="false" target="test-jar-modules"/>
</target>
+ <target name="findbugs" depends="-init-hdk"
+ description="Runs FindBugs on all modules">
+ <echo>
+========================================
+Finding bugs in all class libraries...
+========================================
+</echo>
+ <ant antfile="make/build-test.xml" inheritall="false" target="findbugs"/>
+ </target>
+
<!-- =================================
target: doc
================================= -->
Modified: harmony/enhanced/classlib/branches/java6/depends/build/defines.mak
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/depends/build/defines.mak?rev=822302&r1=822301&r2=822302&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/depends/build/defines.mak (original)
+++ harmony/enhanced/classlib/branches/java6/depends/build/defines.mak Tue Oct 6 14:57:42 2009
@@ -26,8 +26,9 @@
!include <win32.mak>
LIBPATH=$(HY_HDK)\lib\# comment to avoid \ being treated as continuation
-EXEPATH=..\# ditto
DLLPATH=$(HY_HDK)\jdk\jre\bin\# ditto
+EXEPATH=$(HY_HDK)\jdk\jre\bin\# ditto
+DBGPATH=$(HY_HDK)\jdk\lib\# ditto
SHAREDSUB=..\shared\# ditto
!IF "$(HY_OS)-$(HY_ARCH)" == "windows-x86_64"
Modified: harmony/enhanced/classlib/branches/java6/depends/build/defines.mk
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/depends/build/defines.mk?rev=822302&r1=822301&r2=822302&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/depends/build/defines.mk (original)
+++ harmony/enhanced/classlib/branches/java6/depends/build/defines.mk Tue Oct 6 14:57:42 2009
@@ -41,9 +41,10 @@
HYDEBUGCFLAGS = -ggdb -O0
HYRELEASECFLAGS = -O1 -DNDEBUG
-EXEPATH=../
LIBPATH=$(HY_HDK)/lib/
DLLPATH=$(HY_HDK)/jdk/jre/bin/
+EXEPATH=$(HY_HDK)/jdk/jre/bin/
+DBGPATH=$(HY_HDK)/jdk/lib/
SHAREDSUB=../shared/
INCLUDES += -I$(HY_HDK)/include -I$(HY_HDK)/jdk/include -I. -I$(SHAREDSUB)
Modified: harmony/enhanced/classlib/branches/java6/depends/build/platform/linux.ia64.mk
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/depends/build/platform/linux.ia64.mk?rev=822302&r1=822301&r2=822302&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/depends/build/platform/linux.ia64.mk (original)
+++ harmony/enhanced/classlib/branches/java6/depends/build/platform/linux.ia64.mk Tue Oct 6 14:57:42 2009
@@ -15,3 +15,4 @@
DEFINES += -DLINUX -DLINUX_IA64 -DHYIA64 -DIPv6_FUNCTION_SUPPORT
OSLIBS += -ldl
+HY_CAN_LINK_DEBUG = yes
Modified: harmony/enhanced/classlib/branches/java6/depends/build/platform/linux.ppc32.mk
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/depends/build/platform/linux.ppc32.mk?rev=822302&r1=822301&r2=822302&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/depends/build/platform/linux.ppc32.mk (original)
+++ harmony/enhanced/classlib/branches/java6/depends/build/platform/linux.ppc32.mk Tue Oct 6 14:57:42 2009
@@ -18,3 +18,4 @@
ASFLAGS += -a32
LDFLAGS += -m32
OSLIBS += -ldl
+HY_CAN_LINK_DEBUG = yes
Modified: harmony/enhanced/classlib/branches/java6/depends/build/platform/linux.ppc64.mk
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/depends/build/platform/linux.ppc64.mk?rev=822302&r1=822301&r2=822302&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/depends/build/platform/linux.ppc64.mk (original)
+++ harmony/enhanced/classlib/branches/java6/depends/build/platform/linux.ppc64.mk Tue Oct 6 14:57:42 2009
@@ -19,3 +19,4 @@
ASFLAGS += -a64
LDFLAGS += -m64
OSLIBS += -ldl
+HY_CAN_LINK_DEBUG = yes
Modified: harmony/enhanced/classlib/branches/java6/depends/build/platform/linux.s390.mk
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/depends/build/platform/linux.s390.mk?rev=822302&r1=822301&r2=822302&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/depends/build/platform/linux.s390.mk (original)
+++ harmony/enhanced/classlib/branches/java6/depends/build/platform/linux.s390.mk Tue Oct 6 14:57:42 2009
@@ -18,3 +18,4 @@
ASFLAGS += -m31
LDFLAGS += -m31
OSLIBS += -ldl
+HY_CAN_LINK_DEBUG = yes
Modified: harmony/enhanced/classlib/branches/java6/depends/build/platform/linux.s390x.mk
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/depends/build/platform/linux.s390x.mk?rev=822302&r1=822301&r2=822302&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/depends/build/platform/linux.s390x.mk (original)
+++ harmony/enhanced/classlib/branches/java6/depends/build/platform/linux.s390x.mk Tue Oct 6 14:57:42 2009
@@ -18,3 +18,4 @@
ASFLAGS += -m64
LDFLAGS += -m64
OSLIBS += -ldl
+HY_CAN_LINK_DEBUG = yes
Modified: harmony/enhanced/classlib/branches/java6/depends/build/platform/linux.x86.mk
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/depends/build/platform/linux.x86.mk?rev=822302&r1=822301&r2=822302&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/depends/build/platform/linux.x86.mk (original)
+++ harmony/enhanced/classlib/branches/java6/depends/build/platform/linux.x86.mk Tue Oct 6 14:57:42 2009
@@ -16,3 +16,4 @@
DEFINES += -DLINUX -DLINUX_X86 -DHYX86 -DIPv6_FUNCTION_SUPPORT
PLATFORM += -march=pentium3
OSLIBS += -ldl
+HY_CAN_LINK_DEBUG = yes
Modified: harmony/enhanced/classlib/branches/java6/depends/build/platform/linux.x86_64.mk
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/depends/build/platform/linux.x86_64.mk?rev=822302&r1=822301&r2=822302&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/depends/build/platform/linux.x86_64.mk (original)
+++ harmony/enhanced/classlib/branches/java6/depends/build/platform/linux.x86_64.mk Tue Oct 6 14:57:42 2009
@@ -16,3 +16,4 @@
DEFINES += -DLINUX -DLINUX_X86_64 -DHYX86_64 -DIPv6_FUNCTION_SUPPORT
XLIBS = -L/usr/X11R6/lib64 -lX11 -lXft -lXext -lXtst
OSLIBS += -ldl
+HY_CAN_LINK_DEBUG = yes
Modified: harmony/enhanced/classlib/branches/java6/depends/build/rules.mak
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/depends/build/rules.mak?rev=822302&r1=822301&r2=822302&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/depends/build/rules.mak (original)
+++ harmony/enhanced/classlib/branches/java6/depends/build/rules.mak Tue Oct 6 14:57:42 2009
@@ -45,31 +45,41 @@
!ifdef DLLNAME
$(DLLNAME): $(LIBNAME)
+ -mkdir $(DBGPATH)
link $(VMLINK) /debug /opt:icf /opt:ref /INCREMENTAL:NO /NOLOGO \
/NODEFAULTLIB:libcmt /NODEFAULTLIB:libc /FORCE:UNRESOLVED \
-entry:_DllMainCRTStartup$(DLLENTRY) -dll /BASE:$(DLLBASE) -machine:$(CPU) \
$(COMMENT) \
- -subsystem:windows -out:$@ -map:$*.map \
+ -subsystem:windows -out:$@ \
+ -map:$(LIBPATH)$(*F).map -pdb:$(DBGPATH)$(*F).pdb \
+ -manifestfile:$(LIBPATH)$(*F).manifest \
$(BUILDFILES) $(VIRTFILES) $(MDLLIBFILES) $(SYSLIBFILES) \
kernel32.lib msvcrt.lib ws2_32.lib advapi32.lib user32.lib gdi32.lib \
comdlg32.lib winspool.lib $(LIBPATH)$(*F).exp
- if exist $(DLLNAME).manifest \
- mt -manifest $(DLLNAME).manifest -outputresource:$(DLLNAME);#2
+ if exist $(LIBPATH)$(*F).manifest \
+ mt -manifest $(LIBPATH)$(*F).manifest -outputresource:$(DLLNAME);#2
+ -del $(LIBPATH)$(*F).manifest >nul 2>&1
!endif
!ifdef EXENAME
$(EXENAME): $(BUILDFILES) $(VIRTFILES) $(MDLLIBFILES)
+ -mkdir $(DBGPATH)
link /NOLOGO $(EXEFLAGS) /debug /opt:icf /opt:ref $(VMLINK) \
- -out:$(EXENAME) -machine:$(CPU) setargv.obj \
+ -out:$(EXENAME) -pdb:$(DBGPATH)$(*F).pdb \
+ -manifestfile:$(LIBPATH)$(*F).manifest \
+ -machine:$(CPU) setargv.obj \
$(BUILDFILES) $(VIRTFILES) $(MDLLIBFILES) $(EXEDLLFILES)
- if exist $(EXENAME).manifest \
- mt -manifest $(EXENAME).manifest -outputresource:$(EXENAME);#1
+ if exist $(LIBPATH)$(*F).manifest \
+ mt -manifest $(LIBPATH)$(*F).manifest -outputresource:$(EXENAME);#1
+ -del $(LIBPATH)$(*F).manifest >nul 2>&1
!endif
clean:
-del $(BUILDFILES) *.res *.pdb \
$(LIBNAME) $(LIBNAME:.lib=.exp) \
- $(DLLNAME) $(DLLNAME:.dll=.pdb) $(DLLNAME:.dll=.map) \
- $(DLLNAME).manifest \
- $(EXENAME) $(EXENAME:.exe=.pdb) $(EXENAME).manifest \
+ $(LIBNAME:.lib=.map) \
+ $(LIBNAME:.lib=.manifest) \
+ $(DLLNAME) $(DBGPATH)$(LIBBASE).pdb \
+ $(EXENAME) $(DBGPATH)$(EXEBASE).pdb \
+ $(LIBPATH)$(EXEBASE).manifest \
$(CLEANFILES) >nul 2>&1
Modified: harmony/enhanced/classlib/branches/java6/depends/build/rules.mk
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/depends/build/rules.mk?rev=822302&r1=822301&r2=822302&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/depends/build/rules.mk (original)
+++ harmony/enhanced/classlib/branches/java6/depends/build/rules.mk Tue Oct 6 14:57:42 2009
@@ -54,12 +54,24 @@
$(DLLNAME): $(BUILDFILES) $(MDLLIBFILES) $(EXPFILE)
$(DLL_LD) $(DLL_LDFLAGS) $(LDFLAGS) $(VMLINK) -o $@ \
$(BUILDFILES) $(MDLLIBARGS) $(OSLIBS)
+ifeq ($(HY_CAN_LINK_DEBUG),yes)
+ objcopy --only-keep-debug $@ $@.dbg
+ strip --strip-debug --strip-unneeded $@
+ ( cd $(@D) && objcopy --add-gnu-debuglink=$(@F).dbg $(@F) )
+ -mkdir -p $(DBGPATH)
+ test "$@.dbg" = "$(DBGPATH)$(@F).dbg" || \
+ mv $@.dbg $(DBGPATH)$(@F).dbg
+endif
+ifeq ($(HY_OS),zos)
+ mv $(basename $(DLLNAME))$(HY_LINKLIB_SUFFIX) $(LIBPATH)
+endif
$(EXENAME): $(BUILDFILES) $(MDLLIBFILES)
$(CC) $(VMLINK) $(EXELDFLAGS) \
$(BUILDFILES) $(MDLLIBARGS) -o $@ $(OSLIBS) \
- $(EXERPATHPREFIX) -L$(HY_HDK)/jdk/jre/bin
+ $(EXERPATHPREFIX) -L$(DLLPATH)
+ @chmod 755 $(EXENAME)
clean:
-rm -f $(BUILDFILES) $(DLLNAME) $(EXENAME) $(LIBNAME) $(EXPFILE) \
- $(CLEANFILES)
+ $(CLEANFILES) $(DBGPATH)$(notdir $(DLLNAME)).dbg
Modified: harmony/enhanced/classlib/branches/java6/depends/files/rowset.properties
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/depends/files/rowset.properties?rev=822302&r1=822301&r2=822302&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/depends/files/rowset.properties (original)
+++ harmony/enhanced/classlib/branches/java6/depends/files/rowset.properties Tue Oct 6 14:57:42 2009
@@ -14,10 +14,6 @@
# limitations under the License.
-rowset.provider.classname.0=
-rowset.provider.vendor.0=
+rowset.provider.classname.0=org.apache.harmony.sql.internal.rowset.HYOptimisticProvider
+rowset.provider.vendor.0=Apache Harmony
rowset.provider.version.0=
-
-rowset.provider.classname.1=
-rowset.provider.vendor.1=
-rowset.provider.version.1=
Propchange: harmony/enhanced/classlib/branches/java6/depends/libs/windows.x86/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Tue Oct 6 14:57:42 2009
@@ -1,2 +1,4 @@
msvcr71.dll
swing_awt_deps_winxp_2006-09-28.tgz
+jpeg-6b
+lcms-1.18
Propchange: harmony/enhanced/classlib/branches/java6/depends/oss/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Tue Oct 6 14:57:42 2009
@@ -0,0 +1 @@
+findbugs-1.3.9
Modified: harmony/enhanced/classlib/branches/java6/make/build-test.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/make/build-test.xml?rev=822302&r1=822301&r2=822302&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/make/build-test.xml (original)
+++ harmony/enhanced/classlib/branches/java6/make/build-test.xml Tue Oct 6 14:57:42 2009
@@ -54,6 +54,10 @@
<poll-modules target="-test-module" />
</target>
+ <target name="findbugs" depends="check-support-jars">
+ <poll-modules target="findbugs" />
+ </target>
+
<target name="test-jar-init">
<copy file="${basedir}/make/test.properties" tofile="${hy.hdk}/build/test/test.properties"/>
<copy file="${basedir}/make/run-test.xml" tofile="${hy.hdk}/build/test/build.xml"/>
Propchange: harmony/enhanced/classlib/branches/java6/make/depends-common.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Oct 6 14:57:42 2009
@@ -1 +1 @@
-/harmony/enhanced/classlib/trunk/make/depends-common.xml:768152-814402
+/harmony/enhanced/classlib/trunk/make/depends-common.xml:768152-822279
Modified: harmony/enhanced/classlib/branches/java6/make/depends.properties
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/make/depends.properties?rev=822302&r1=822301&r2=822302&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/make/depends.properties (original)
+++ harmony/enhanced/classlib/branches/java6/make/depends.properties Tue Oct 6 14:57:42 2009
@@ -43,6 +43,11 @@
hamcrest-library.url=${maven2.base}/org/hamcrest/hamcrest-library/1.1/hamcrest-library-1.1.jar
hamcrest-library.md5=271f78edc4333f0f44df617676e0a874
+findbugs.dir=${depends.dir}/oss/findbugs-1.3.9
+findbugs.zip=${findbugs.dir}/findbugs-1.3.9.zip
+findbugs.url=http://downloads.sourceforge.net/project/findbugs/findbugs/1.3.9/findbugs-1.3.9.zip
+findbugs.md5=73702d533a505bd98d0c2c585a29a08b
+
msvcr.dir=${depends.dir}/libs/${hy.platform}
msvcp.dir=${depends.dir}/libs/${hy.platform}
Modified: harmony/enhanced/classlib/branches/java6/make/depends.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/make/depends.xml?rev=822302&r1=822301&r2=822302&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/make/depends.xml (original)
+++ harmony/enhanced/classlib/branches/java6/make/depends.xml Tue Oct 6 14:57:42 2009
@@ -39,6 +39,7 @@
<check-one-file src="${xmlsec.url}" dest="${xmlsec.zip}" />
<check-one-file src="${junit.url}" dest="${junit.jar}" />
<check-one-file src="${hamcrest-library.url}" dest="${hamcrest-library.jar}" />
+ <check-one-file src="${findbugs.url}" dest="${findbugs.zip}" />
<check-one-file src="${bcprov.url}" dest="${bcprov.jar}" />
<check-one-file src="${jetty.url}" dest="${jetty.jar}" />
<check-one-file src="${jetty-util.url}" dest="${jetty-util.jar}" />
@@ -55,7 +56,7 @@
</target>
<target name="-extract"
- depends="-extract-props,-extract-xerces,-fix-xalan-manifest" />
+ depends="-extract-props,-extract-xerces,-fix-xalan-manifest,-extract-findbugs" />
<target name="-extract-props">
<uptodate property="xerces.uptodate"
@@ -64,6 +65,9 @@
<uptodate property="xalan.uptodate"
srcfile="${xalan.orig.jar}"
targetfile="${xalan.jar}" />
+ <uptodate property="findbugs.uptodate"
+ srcfile="${findbugs.zip}"
+ targetfile="${findbugs.dir}/uptodate" />
</target>
<target name="-extract-xerces" unless="xerces.uptodate">
@@ -90,6 +94,12 @@
<delete dir="${xalan.dir}.tmp" />
</target>
+ <target name="-extract-findbugs" unless="findbugs.uptodate">
+ <!-- Note that FindBugs contains a top level dir name -->
+ <unzip src="${findbugs.zip}" dest="${findbugs.dir}/.." />
+ <touch file="${findbugs.dir}/uptodate" />
+ </target>
+
<target name="download" description="Download required jars"
depends="-download,-download-win" />
@@ -116,6 +126,11 @@
dest="${hamcrest-library.jar}"
md5="${hamcrest-library.md5}" />
+ <mkdir dir="${findbugs.dir}" />
+ <download-one-file src="${findbugs.url}"
+ dest="${findbugs.zip}"
+ md5="${findbugs.md5}" />
+
<mkdir dir="${bcprov.dir}" />
<download-one-file src="${bcprov.url}" dest="${bcprov.jar}"
md5="${bcprov.md5}" />
Modified: harmony/enhanced/classlib/branches/java6/make/properties.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/make/properties.xml?rev=822302&r1=822301&r2=822302&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/make/properties.xml (original)
+++ harmony/enhanced/classlib/branches/java6/make/properties.xml Tue Oct 6 14:57:42 2009
@@ -347,6 +347,8 @@
<property name="tests.resources.hdk.dir"
value="${tests.hdk.dir}/resources" />
+ <property name="findBugs.report" location="../../build/findbugs_report" />
+
<target name="echo" depends="svn-prop, svn-info, test-jre-vm-info"
description="Display the properties defined by this ant file" >
<echo>
@@ -369,6 +371,7 @@
hy.test.timeout = ${hy.test.timeout}
hy.test.vm.name = ${hy.test.vm.name}
hy.test.vmargs = ${hy.test.vmargs}
+ findbugs.available = ${findbugs.available}
Harmony platform properties:
@@ -900,4 +903,44 @@
</sequential>
</macrodef>
+ <macrodef name="run-findBugs">
+ <attribute name="outputFile"/>
+ <attribute name="excludeFilter"/>
+ <attribute name="jarFile"/>
+ <sequential>
+ <!-- Find and define findbugs task -->
+ <property name="findbugs.home" location="${basedir}/../../depends/oss/findbugs-1.3.9"/>
+ <available
+ classname="edu.umd.cs.findbugs.anttask.FindBugsTask"
+ classpath="${findbugs.home}/lib/findbugs-ant.jar"
+ property="findbugs.available"/>
+ <taskdef
+ name="findbugs"
+ classname="edu.umd.cs.findbugs.anttask.FindBugsTask"
+ classpath="${findbugs.home}/lib/findbugs-ant.jar"
+ onerror="ignore"/>
+ <fail message="FindBugs is unavailable" unless="findbugs.available"/>
+
+ <!-- Run findbugs using the attributes given -->
+ <dirname file="@{outputFile}" property="@{outputFile}.dir" />
+ <mkdir dir="${@{outputFile}.dir}" />
+ <findbugs home="${findbugs.home}"
+ output="xml"
+ outputFile="@{outputFile}"
+ excludeFilter="@{excludeFilter}"
+ jvmargs="-Xmx512M"
+ workhard="true">
+ <auxClasspath>
+ <fileset dir="${hy.jdk}/jre/lib/boot">
+ <include name="**/*.jar" />
+ </fileset>
+ </auxClasspath>
+ <sourcePath path="src/main/java" />
+ <sourcePath path="src/main/java/common" />
+ <sourcePath path="src/main/java/${hy.os.family}" />
+ <class location="@{jarFile}" />
+ </findbugs>
+ </sequential>
+ </macrodef>
+
</project>
Modified: harmony/enhanced/classlib/branches/java6/modules/accessibility/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/accessibility/build.xml?rev=822302&r1=822301&r2=822302&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/accessibility/build.xml (original)
+++ harmony/enhanced/classlib/branches/java6/modules/accessibility/build.xml Tue Oct 6 14:57:42 2009
@@ -81,6 +81,13 @@
</javac>
</target>
+ <target name="findbugs" depends="build-jar">
+ <run-findBugs
+ jarFile="${hy.jdk}/jre/lib/boot/accessibility.jar"
+ excludeFilter="make/findbugs-exclude-filter.xml"
+ outputFile="${findBugs.report}/accessibility.xml"/>
+ </target>
+
<target name="build-jar" depends="svn-info,class-patternset">
<mkdir dir="${hy.jdk}/jre/lib/boot"/>
<jar destfile="${hy.jdk}/jre/lib/boot/accessibility.jar"
Modified: harmony/enhanced/classlib/branches/java6/modules/annotation/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/annotation/build.xml?rev=822302&r1=822301&r2=822302&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/annotation/build.xml (original)
+++ harmony/enhanced/classlib/branches/java6/modules/annotation/build.xml Tue Oct 6 14:57:42 2009
@@ -81,6 +81,13 @@
</javac>
</target>
+ <target name="findbugs" depends="build-jar">
+ <run-findBugs
+ jarFile="${hy.jdk}/jre/lib/boot/annotation.jar"
+ excludeFilter="make/findbugs-exclude-filter.xml"
+ outputFile="${findBugs.report}/annotation.xml"/>
+ </target>
+
<target name="build-jar" depends="svn-info,class-patternset">
<jar destfile="${hy.jdk}/jre/lib/boot/annotation.jar"
manifest="META-INF/MANIFEST.MF"
Modified: harmony/enhanced/classlib/branches/java6/modules/annotation/src/main/java/java/lang/annotation/Retention.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/annotation/src/main/java/java/lang/annotation/Retention.java?rev=822302&r1=822301&r2=822302&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/annotation/src/main/java/java/lang/annotation/Retention.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/annotation/src/main/java/java/lang/annotation/Retention.java Tue Oct 6 14:57:42 2009
@@ -22,11 +22,18 @@
* annotation. If the retention annotation is not set {@code
* RetentionPolicy.CLASS} is used as default retention.
*
+ * @see RetentionPolicy
* @since 1.5
*/
@Documented
@Retention(RetentionPolicy.RUNTIME)
@Target(ElementType.ANNOTATION_TYPE)
public @interface Retention {
+
+ /**
+ * Returns the retention policy for the annotation.
+ *
+ * @return a retention policy as defined in {@code RetentionPolicy}
+ */
RetentionPolicy value();
}
Modified: harmony/enhanced/classlib/branches/java6/modules/annotation/src/main/java/java/lang/annotation/Target.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/annotation/src/main/java/java/lang/annotation/Target.java?rev=822302&r1=822301&r2=822302&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/annotation/src/main/java/java/lang/annotation/Target.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/annotation/src/main/java/java/lang/annotation/Target.java Tue Oct 6 14:57:42 2009
@@ -20,12 +20,19 @@
/**
* Defines a meta-annotation for determining what {@link ElementType}s an
* annotation can be applied to.
- *
+ *
+ * @see ElementType
* @since 1.5
*/
@Documented
@Retention(RetentionPolicy.RUNTIME)
@Target(ElementType.ANNOTATION_TYPE)
public @interface Target {
+
+ /**
+ * Returns the program element types for which this annotation is applied.
+ *
+ * @return the types of element as defined by {@code ElementType}
+ */
ElementType[] value();
}
Modified: harmony/enhanced/classlib/branches/java6/modules/applet/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/applet/build.xml?rev=822302&r1=822301&r2=822302&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/applet/build.xml (original)
+++ harmony/enhanced/classlib/branches/java6/modules/applet/build.xml Tue Oct 6 14:57:42 2009
@@ -81,6 +81,13 @@
</javac>
</target>
+ <target name="findbugs" depends="build-jar">
+ <run-findBugs
+ jarFile="${hy.jdk}/jre/lib/boot/applet.jar"
+ excludeFilter="make/findbugs-exclude-filter.xml"
+ outputFile="${findBugs.report}/applet.xml"/>
+ </target>
+
<target name="build-jar" depends="svn-info,class-patternset">
<jar destfile="${hy.jdk}/jre/lib/boot/applet.jar"
manifest="META-INF/MANIFEST.MF"
Modified: harmony/enhanced/classlib/branches/java6/modules/archive/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/archive/build.xml?rev=822302&r1=822301&r2=822302&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/archive/build.xml (original)
+++ harmony/enhanced/classlib/branches/java6/modules/archive/build.xml Tue Oct 6 14:57:42 2009
@@ -95,36 +95,10 @@
<target name="-build-native-zlib" unless="hy.skip.zlib">
<make dir="src/main/native/zlib/${hy.os.family}" />
- <copy todir="${hy.jdk}/jre/bin" preservelastmodified="true">
- <fileset dir="src/main/native/zlib">
- <include name="*${shlib.suffix}*"/>
- <include name="*${progdb.suffix}*" if="is.windows" />
- <exclude name="*${manifest.suffix}"/>
- </fileset>
- </copy>
- <!-- Copy link exports file on z/OS -->
- <copy todir="${hy.hdk}/lib" preservelastmodified="true">
- <fileset dir="src/main/native/zlib/${hy.os.family}">
- <include name="*${linklib.suffix}" if="is.zos" />
- </fileset>
- </copy>
</target>
<target name="-build-native-archive">
<make dir="src/main/native/archive/${hy.os.family}" />
- <copy todir="${hy.jdk}/jre/bin" preservelastmodified="true">
- <fileset dir="src/main/native/archive">
- <include name="*${shlib.suffix}*"/>
- <include name="*${progdb.suffix}*" if="is.windows" />
- <exclude name="*${manifest.suffix}"/>
- </fileset>
- </copy>
- <!-- Copy link exports file on z/OS -->
- <copy todir="${hy.hdk}/lib" preservelastmodified="true">
- <fileset dir="src/main/native/archive/${hy.os.family}">
- <include name="*${linklib.suffix}" if="is.zos" />
- </fileset>
- </copy>
</target>
<target name="clean-native"
@@ -204,6 +178,13 @@
</javac>
</target>
+ <target name="findbugs" depends="build-jar">
+ <run-findBugs
+ jarFile="${hy.jdk}/jre/lib/boot/archive.jar"
+ excludeFilter="make/findbugs-exclude-filter.xml"
+ outputFile="${findBugs.report}/archive.xml"/>
+ </target>
+
<target name="build-jar" depends="svn-info,class-patternset">
<jar destfile="${hy.jdk}/jre/lib/boot/archive.jar"
manifest="META-INF/MANIFEST.MF"
Modified: harmony/enhanced/classlib/branches/java6/modules/archive/src/main/java/java/util/zip/Deflater.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/archive/src/main/java/java/util/zip/Deflater.java?rev=822302&r1=822301&r2=822302&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/archive/src/main/java/java/util/zip/Deflater.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/archive/src/main/java/java/util/zip/Deflater.java Tue Oct 6 14:57:42 2009
@@ -17,7 +17,6 @@
package java.util.zip;
-import org.apache.harmony.luni.platform.OSResourcesMonitor;
/**
* This class compresses data using the <i>DEFLATE</i> algorithm (see <a
@@ -147,8 +146,7 @@
throw new IllegalArgumentException();
}
compressLevel = level;
- streamHandle = createStreamWithMemoryEnsurance(compressLevel, strategy,
- noHeader);
+ streamHandle = createStream(compressLevel, strategy, noHeader);
}
/**
@@ -493,11 +491,5 @@
return getTotalOutImpl(streamHandle);
}
- private long createStreamWithMemoryEnsurance(int level, int strategy1,
- boolean noHeader1) {
- OSResourcesMonitor.ensurePhysicalMemoryCapacity();
- return createStream(level, strategy1, noHeader1);
- }
-
private native long createStream(int level, int strategy1, boolean noHeader1);
}
Propchange: harmony/enhanced/classlib/branches/java6/modules/archive/src/main/native/archive/
('svn:ignore' removed)
Modified: harmony/enhanced/classlib/branches/java6/modules/archive/src/main/native/archive/unix/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/archive/src/main/native/archive/unix/makefile?rev=822302&r1=822301&r2=822302&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/archive/src/main/native/archive/unix/makefile (original)
+++ harmony/enhanced/classlib/branches/java6/modules/archive/src/main/native/archive/unix/makefile Tue Oct 6 14:57:42 2009
@@ -33,7 +33,7 @@
$(MDLLIBZLIB) $(LIBPATH)libhypool.a \
$(LIBPATH)libvmi$(HY_LINKLIB_SUFFIX)
-DLLNAME=../libhyarchive$(HY_SHLIB_SUFFIX)
+DLLNAME=$(DLLPATH)libhyarchive$(HY_SHLIB_SUFFIX)
EXPNAME=HYARCHIVE_0.1
include $(HY_HDK)/build/make/rules.mk
Modified: harmony/enhanced/classlib/branches/java6/modules/archive/src/main/native/archive/windows/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/archive/src/main/native/archive/windows/makefile?rev=822302&r1=822301&r2=822302&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/archive/src/main/native/archive/windows/makefile (original)
+++ harmony/enhanced/classlib/branches/java6/modules/archive/src/main/native/archive/windows/makefile Tue Oct 6 14:57:42 2009
@@ -20,7 +20,7 @@
!include <$(HY_HDK)\build\make\defines.mak>
LIBBASE=hyarchive
-DLLNAME=..\$(LIBBASE).dll
+DLLNAME=$(DLLPATH)$(LIBBASE).dll
LIBNAME=$(LIBPATH)$(LIBBASE).lib
HYCFLAGS = $(HYCFLAGS) /I$(SHAREDSUB) /I$(SHARED)common /I..\..\zlib_dist \
/I..\..\include\shared
Propchange: harmony/enhanced/classlib/branches/java6/modules/archive/src/main/native/zlib/
('svn:ignore' removed)
Modified: harmony/enhanced/classlib/branches/java6/modules/archive/src/main/native/zlib/unix/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/archive/src/main/native/zlib/unix/makefile?rev=822302&r1=822301&r2=822302&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/archive/src/main/native/zlib/unix/makefile (original)
+++ harmony/enhanced/classlib/branches/java6/modules/archive/src/main/native/zlib/unix/makefile Tue Oct 6 14:57:42 2009
@@ -36,7 +36,7 @@
$(ZLIB_DIST)crc32.o $(ZLIB_DIST)deflate.o $(ZLIB_DIST)infback.o $(ZLIB_DIST)inffast.o \
$(ZLIB_DIST)inflate.o $(ZLIB_DIST)inftrees.o $(ZLIB_DIST)trees.o $(ZLIB_DIST)uncompr.o $(ZLIB_DIST)zutil.o
-DLLNAME = ../libhyzlib$(HY_SHLIB_SUFFIX)
+DLLNAME = $(DLLPATH)libhyzlib$(HY_SHLIB_SUFFIX)
EXPNAME = HYZLIB_0.1
ifeq ($(DLL_LD),$(CC))
Modified: harmony/enhanced/classlib/branches/java6/modules/archive/src/main/native/zlib/windows/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/archive/src/main/native/zlib/windows/makefile?rev=822302&r1=822301&r2=822302&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/archive/src/main/native/zlib/windows/makefile (original)
+++ harmony/enhanced/classlib/branches/java6/modules/archive/src/main/native/zlib/windows/makefile Tue Oct 6 14:57:42 2009
@@ -20,7 +20,7 @@
!include <$(HY_HDK)\build\make\defines.mak>
LIBBASE=hyzlib
-DLLNAME=..\$(LIBBASE).dll
+DLLNAME=$(DLLPATH)$(LIBBASE).dll
LIBNAME=$(LIBPATH)$(LIBBASE).lib
ZLIB_DIST=..\..\zlib_dist\# Path to zlib
Modified: harmony/enhanced/classlib/branches/java6/modules/auth/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/auth/build.xml?rev=822302&r1=822301&r2=822302&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/auth/build.xml (original)
+++ harmony/enhanced/classlib/branches/java6/modules/auth/build.xml Tue Oct 6 14:57:42 2009
@@ -48,21 +48,6 @@
<target name="build-native" depends="build-native-all" />
<target name="build-native-all" >
<make dir="src/main/native/auth/${hy.os.family}" />
-
- <!-- Copy the built shared libs over to the jre/bin dir -->
- <copy todir="${hy.jdk}/jre/bin" preservelastmodified="true">
- <fileset dir="src/main/native/auth">
- <include name="*${shlib.suffix}*"/>
- <include name="*${progdb.suffix}*" if="is.windows" />
- <exclude name="*${manifest.suffix}"/>
- </fileset>
- </copy>
- <!-- Copy link exports file on z/OS -->
- <copy todir="${hy.hdk}/lib" preservelastmodified="true">
- <fileset dir="src/main/native/auth/${hy.os.family}">
- <include name="*${linklib.suffix}" if="is.zos" />
- </fileset>
- </copy>
</target>
<target name="clean-java" depends="class-patternset">
@@ -111,6 +96,13 @@
</javac>
</target>
+ <target name="findbugs" depends="build-jar">
+ <run-findBugs
+ jarFile="${hy.jdk}/jre/lib/boot/auth.jar"
+ excludeFilter="make/findbugs-exclude-filter.xml"
+ outputFile="${findBugs.report}/auth.xml"/>
+ </target>
+
<target name="build-jar" depends="svn-info,class-patternset">
<jar destfile="${hy.jdk}/jre/lib/boot/auth.jar"
manifest="META-INF/MANIFEST.MF"
Propchange: harmony/enhanced/classlib/branches/java6/modules/auth/src/main/native/auth/
('svn:ignore' removed)
Modified: harmony/enhanced/classlib/branches/java6/modules/auth/src/main/native/auth/unix/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/auth/src/main/native/auth/unix/makefile?rev=822302&r1=822301&r2=822302&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/auth/src/main/native/auth/unix/makefile (original)
+++ harmony/enhanced/classlib/branches/java6/modules/auth/src/main/native/auth/unix/makefile Tue Oct 6 14:57:42 2009
@@ -29,7 +29,7 @@
$(LIBPATH)libhypool.a \
$(LIBPATH)libvmi$(HY_LINKLIB_SUFFIX)
-DLLNAME = ../libhyauth$(HY_SHLIB_SUFFIX)
+DLLNAME = $(DLLPATH)libhyauth$(HY_SHLIB_SUFFIX)
EXPNAME = HYAUTH_0.1
include $(HY_HDK)/build/make/rules.mk
Modified: harmony/enhanced/classlib/branches/java6/modules/auth/src/main/native/auth/windows/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/auth/src/main/native/auth/windows/makefile?rev=822302&r1=822301&r2=822302&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/auth/src/main/native/auth/windows/makefile (original)
+++ harmony/enhanced/classlib/branches/java6/modules/auth/src/main/native/auth/windows/makefile Tue Oct 6 14:57:42 2009
@@ -20,7 +20,7 @@
!include <$(HY_HDK)\build\make\defines.mak>
LIBBASE=hyauth
-DLLNAME=..\$(LIBBASE).dll
+DLLNAME=$(DLLPATH)$(LIBBASE).dll
LIBNAME=$(LIBPATH)$(LIBBASE).lib
BUILDFILES = $(SHAREDSUB)auth_copyright.obj authwin32.obj
VIRTFILES = $(LIBBASE).res
Modified: harmony/enhanced/classlib/branches/java6/modules/awt/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/awt/build.xml?rev=822302&r1=822301&r2=822302&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/awt/build.xml (original)
+++ harmony/enhanced/classlib/branches/java6/modules/awt/build.xml Tue Oct 6 14:57:42 2009
@@ -217,6 +217,13 @@
tofile="${hy.jdk}/jre/lib/font.properties"/>
</target>
+ <target name="findbugs" depends="build-jar">
+ <run-findBugs
+ jarFile="${hy.jdk}/jre/lib/boot/awt.jar"
+ excludeFilter="make/findbugs-exclude-filter.xml"
+ outputFile="${findBugs.report}/awt.xml"/>
+ </target>
+
<target name="build-jar" depends="svn-info,class-patternset">
<jar destfile="${hy.jdk}/jre/lib/boot/awt.jar"
manifest="META-INF/MANIFEST.MF"
@@ -252,145 +259,30 @@
</make-elements>
</make>
- <!-- Copy the built shared libs over to the jre/bin dir -->
- <copy todir="${hy.jdk}/jre/bin" preservelastmodified="true">
- <fileset dir="src/main/native/lcmm">
- <include name="*${shlib.suffix}*"/>
- <include name="*${progdb.suffix}*" if="is.windows" />
- <exclude name="*${manifest.suffix}"/>
- </fileset>
- </copy>
- <!-- Copy link exports file on z/OS -->
- <copy todir="${hy.hdk}/lib" preservelastmodified="true">
- <fileset dir="src/main/native/lcmm/${hy.os.family}">
- <include name="*${linklib.suffix}" if="is.zos" />
- </fileset>
- </copy>
-
<make dir="src/main/native/jpegdecoder/${hy.os.family}">
<make-elements>
<env key="HY_JPEG_VER" value="${jpeg.ver}" />
</make-elements>
</make>
- <!-- Copy the built shared libs over to the jre/bin dir -->
- <copy todir="${hy.jdk}/jre/bin" preservelastmodified="true">
- <fileset dir="src/main/native/jpegdecoder">
- <include name="*${shlib.suffix}*"/>
- <include name="*${progdb.suffix}*" if="is.windows" />
- <exclude name="*${manifest.suffix}"/>
- </fileset>
- </copy>
- <!-- Copy link exports file on z/OS -->
- <copy todir="${hy.hdk}/lib" preservelastmodified="true">
- <fileset dir="src/main/native/jpegdecoder/${hy.os.family}">
- <include name="*${linklib.suffix}" if="is.zos" />
- </fileset>
- </copy>
<make dir="src/main/native/gl/${hy.os.family}">
<make-elements>
<env key="HY_PNG_VER" value="${png.ver}" />
</make-elements>
</make>
-
- <!-- Copy the built shared libs over to the jre/bin dir -->
- <copy todir="${hy.jdk}/jre/bin" preservelastmodified="true">
- <fileset dir="src/main/native/gl">
- <include name="*${shlib.suffix}*"/>
- <include name="*${progdb.suffix}*" if="is.windows" />
- <exclude name="*${manifest.suffix}"/>
- </fileset>
- </copy>
- <!-- Copy link exports file on z/OS -->
- <copy todir="${hy.hdk}/lib" preservelastmodified="true">
- <fileset dir="src/main/native/gl/${hy.os.family}">
- <include name="*${linklib.suffix}" if="is.zos" />
- </fileset>
- </copy>
<make dir="src/main/native/oglwrapper/${hy.os.family}" />
- <!-- Copy the built shared libs over to the jre/bin dir -->
- <copy todir="${hy.jdk}/jre/bin" preservelastmodified="true">
- <fileset dir="src/main/native/oglwrapper">
- <include name="*${shlib.suffix}*"/>
- <include name="*${progdb.suffix}*" if="is.windows" />
- <exclude name="*${manifest.suffix}"/>
- </fileset>
- </copy>
- <!-- Copy link exports file on z/OS -->
- <copy todir="${hy.hdk}/lib" preservelastmodified="true">
- <fileset dir="src/main/native/oglwrapper/${hy.os.family}">
- <include name="*${linklib.suffix}" if="is.zos" />
- </fileset>
- </copy>
-
<make dir="src/main/native/fontlib/${hy.os.family}" />
- <!-- Copy the built shared libs over to the jre/bin dir -->
- <copy todir="${hy.jdk}/jre/bin" preservelastmodified="true">
- <fileset dir="src/main/native/fontlib">
- <include name="*${shlib.suffix}*"/>
- <include name="*${progdb.suffix}*" if="is.windows" />
- <exclude name="*${manifest.suffix}"/>
- </fileset>
- </copy>
- <!-- Copy link exports file on z/OS -->
- <copy todir="${hy.hdk}/lib" preservelastmodified="true">
- <fileset dir="src/main/native/fontlib/${hy.os.family}">
- <include name="*${linklib.suffix}" if="is.zos" />
- </fileset>
- </copy>
</target>
<target name="-build-native-unix" if="is.unix">
<make dir="src/main/native/x11wrapper/${hy.os.family}" />
- <!-- Copy the built shared libs over to the jre/bin dir -->
- <copy todir="${hy.jdk}/jre/bin" preservelastmodified="true">
- <fileset dir="src/main/native/x11wrapper">
- <include name="*${shlib.suffix}*"/>
- </fileset>
- </copy>
- <!-- Copy link exports file on z/OS -->
- <copy todir="${hy.hdk}/lib" preservelastmodified="true">
- <fileset dir="src/main/native/x11wrapper/${hy.os.family}">
- <include name="*${linklib.suffix}" if="is.zos" />
- </fileset>
- </copy>
-
<make dir="src/main/native/linuxfont/${hy.os.family}" />
- <!-- Copy the built shared libs over to the jre/bin dir -->
- <copy todir="${hy.jdk}/jre/bin" preservelastmodified="true">
- <fileset dir="src/main/native/linuxfont">
- <include name="*${shlib.suffix}*"/>
- </fileset>
- </copy>
- <!-- Copy link exports file on z/OS -->
- <copy todir="${hy.hdk}/lib" preservelastmodified="true">
- <fileset dir="src/main/native/linuxfont/${hy.os.family}">
- <include name="*${linklib.suffix}" if="is.zos" />
- </fileset>
- </copy>
</target>
<target name="-build-native-windows" if="is.windows">
<make dir="src/main/native/win32wrapper/${hy.os.family}" />
- <!-- Copy the built shared libs over to the jre/bin dir -->
- <copy todir="${hy.jdk}/jre/bin" preservelastmodified="true">
- <fileset dir="src/main/native/win32wrapper">
- <include name="*${shlib.suffix}*"/>
- <include name="*${progdb.suffix}*" />
- <exclude name="*${manifest.suffix}"/>
- </fileset>
- </copy>
-
<make dir="src/main/native/winfont/${hy.os.family}" />
- <!-- Copy the built shared libs over to the jre/bin dir -->
- <copy todir="${hy.jdk}/jre/bin" preservelastmodified="true">
- <fileset dir="src/main/native/winfont">
- <include name="*${shlib.suffix}*"/>
- <include name="*${progdb.suffix}*" />
- <exclude name="*${manifest.suffix}"/>
- </fileset>
- </copy>
</target>
<target name="clean-native"
Propchange: harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/fontlib/
('svn:ignore' removed)
Modified: harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/fontlib/unix/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/fontlib/unix/makefile?rev=822302&r1=822301&r2=822302&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/fontlib/unix/makefile (original)
+++ harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/fontlib/unix/makefile Tue Oct 6 14:57:42 2009
@@ -41,7 +41,7 @@
OSLIBS += $(STDCLIBS)
-DLLNAME=../libFL$(HY_LINKLIB_SUFFIX)
+DLLNAME=$(DLLPATH)libFL$(HY_LINKLIB_SUFFIX)
EXPNAME=HYFONTLIB_0.1
include $(HY_HDK)/build/make/rules.mk
Modified: harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/fontlib/windows/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/fontlib/windows/makefile?rev=822302&r1=822301&r2=822302&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/fontlib/windows/makefile (original)
+++ harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/fontlib/windows/makefile Tue Oct 6 14:57:42 2009
@@ -16,7 +16,7 @@
!include <$(HY_HDK)\build\make\defines.mak>
LIBBASE=FL
-DLLNAME=..\$(LIBBASE).dll
+DLLNAME=$(DLLPATH)$(LIBBASE).dll
LIBNAME=$(LIBPATH)$(LIBBASE).lib
HYLDFLAGS = $(HYLDFLAGS) -def:$(LIBBASE).def
Propchange: harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/gl/
('svn:ignore' removed)
Modified: harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/gl/unix/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/gl/unix/makefile?rev=822302&r1=822301&r2=822302&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/gl/unix/makefile (original)
+++ harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/gl/unix/makefile Tue Oct 6 14:57:42 2009
@@ -44,7 +44,7 @@
OSLIBS += $(STDCLIBS) $(XLIBS)
-DLLNAME=../libgl$(HY_SHLIB_SUFFIX)
+DLLNAME=$(DLLPATH)libgl$(HY_SHLIB_SUFFIX)
EXPNAME=HYGL_0.1
include $(HY_HDK)/build/make/rules.mk
Modified: harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/gl/windows/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/gl/windows/makefile?rev=822302&r1=822301&r2=822302&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/gl/windows/makefile (original)
+++ harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/gl/windows/makefile Tue Oct 6 14:57:42 2009
@@ -19,7 +19,7 @@
PNG_DIR=$(HY_HDK)\..\depends\libs\$(HY_PLATFORM)\png-$(HY_PNG_VER)\# avoid continuation
LIBBASE=gl
-DLLNAME=..\$(LIBBASE).dll
+DLLNAME=$(DLLPATH)$(LIBBASE).dll
LIBNAME=$(LIBPATH)$(LIBBASE).lib
HYLDFLAGS = $(HYLDFLAGS) -def:$(LIBBASE).def
Propchange: harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/jpegdecoder/
('svn:ignore' removed)
Modified: harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/jpegdecoder/unix/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/jpegdecoder/unix/makefile?rev=822302&r1=822301&r2=822302&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/jpegdecoder/unix/makefile (original)
+++ harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/jpegdecoder/unix/makefile Tue Oct 6 14:57:42 2009
@@ -28,7 +28,7 @@
MDLLIBFILES += $(LIBPATH)libhypool.a \
$(LIBPATH)libvmi$(HY_LINKLIB_SUFFIX)
-DLLNAME=../libjpegdecoder$(HY_SHLIB_SUFFIX)
+DLLNAME=$(DLLPATH)libjpegdecoder$(HY_SHLIB_SUFFIX)
EXPNAME=HYJPEGDECODER_0.1
include $(HY_HDK)/build/make/rules.mk
Modified: harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/jpegdecoder/windows/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/jpegdecoder/windows/makefile?rev=822302&r1=822301&r2=822302&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/jpegdecoder/windows/makefile (original)
+++ harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/jpegdecoder/windows/makefile Tue Oct 6 14:57:42 2009
@@ -18,7 +18,7 @@
JPEG_DIR=$(HY_HDK)\..\depends\libs\$(HY_PLATFORM)\jpeg-$(HY_JPEG_VER)\# avoid continuation
LIBBASE=jpegdecoder
-DLLNAME=..\$(LIBBASE).dll
+DLLNAME=$(DLLPATH)$(LIBBASE).dll
LIBNAME=$(LIBPATH)$(LIBBASE).lib
HYLDFLAGS = $(HYLDFLAGS) -def:$(LIBBASE).def
Propchange: harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/lcmm/
('svn:ignore' removed)
Modified: harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/lcmm/unix/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/lcmm/unix/makefile?rev=822302&r1=822301&r2=822302&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/lcmm/unix/makefile (original)
+++ harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/lcmm/unix/makefile Tue Oct 6 14:57:42 2009
@@ -33,7 +33,7 @@
MDLLIBFILES += $(LIBPATH)libhypool.a \
$(LIBPATH)libvmi$(HY_LINKLIB_SUFFIX)
-DLLNAME=../liblcmm$(HY_SHLIB_SUFFIX)
+DLLNAME=$(DLLPATH)liblcmm$(HY_SHLIB_SUFFIX)
EXPNAME=HYLCMM_0.1
include $(HY_HDK)/build/make/rules.mk
Modified: harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/lcmm/windows/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/lcmm/windows/makefile?rev=822302&r1=822301&r2=822302&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/lcmm/windows/makefile (original)
+++ harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/lcmm/windows/makefile Tue Oct 6 14:57:42 2009
@@ -18,7 +18,7 @@
LCMS_DIR=$(HY_HDK)\..\depends\libs\$(HY_PLATFORM)\lcms-$(HY_LCMS_VER)\# avoid continuation
LIBBASE=lcmm
-DLLNAME=..\$(LIBBASE).dll
+DLLNAME=$(DLLPATH)$(LIBBASE).dll
LIBNAME=$(LIBPATH)$(LIBBASE).lib
HYLDFLAGS = $(HYLDFLAGS) -def:$(LIBBASE).def
Propchange: harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/linuxfont/
('svn:ignore' removed)
Modified: harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/linuxfont/unix/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/linuxfont/unix/makefile?rev=822302&r1=822301&r2=822302&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/linuxfont/unix/makefile (original)
+++ harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/linuxfont/unix/makefile Tue Oct 6 14:57:42 2009
@@ -31,11 +31,12 @@
endif
MDLLIBFILES += $(LIBPATH)libhypool.a \
- $(LIBPATH)libvmi$(HY_LINKLIB_SUFFIX) ../../fontlib/libFL$(HY_LINKLIB_SUFFIX)
+ $(LIBPATH)libvmi$(HY_LINKLIB_SUFFIX) \
+ $(DLLPATH)libFL$(HY_LINKLIB_SUFFIX)
OSLIBS += $(XLIBS)
-DLLNAME=../liblinuxfont$(HY_SHLIB_SUFFIX)
+DLLNAME=$(DLLPATH)liblinuxfont$(HY_SHLIB_SUFFIX)
EXPNAME=HYLINUXFONT_0.1
include $(HY_HDK)/build/make/rules.mk
Propchange: harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/oglwrapper/
('svn:ignore' removed)
Modified: harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/oglwrapper/unix/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/oglwrapper/unix/makefile?rev=822302&r1=822301&r2=822302&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/oglwrapper/unix/makefile (original)
+++ harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/oglwrapper/unix/makefile Tue Oct 6 14:57:42 2009
@@ -29,7 +29,7 @@
OSLIBS += $(STDCLIBS)
-DLLNAME=../liboglwrapper$(HY_SHLIB_SUFFIX)
+DLLNAME=$(DLLPATH)liboglwrapper$(HY_SHLIB_SUFFIX)
EXPNAME=HYOGLWRAPPER_0.1
include $(HY_HDK)/build/make/rules.mk
Modified: harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/oglwrapper/windows/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/oglwrapper/windows/makefile?rev=822302&r1=822301&r2=822302&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/oglwrapper/windows/makefile (original)
+++ harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/oglwrapper/windows/makefile Tue Oct 6 14:57:42 2009
@@ -16,7 +16,7 @@
!include <$(HY_HDK)\build\make\defines.mak>
LIBBASE=oglwrapper
-DLLNAME=..\$(LIBBASE).dll
+DLLNAME=$(DLLPATH)$(LIBBASE).dll
LIBNAME=$(LIBPATH)$(LIBBASE).lib
HYLDFLAGS = $(HYLDFLAGS) -def:$(LIBBASE).def
Propchange: harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/win32wrapper/
('svn:ignore' removed)
Modified: harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/win32wrapper/windows/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/win32wrapper/windows/makefile?rev=822302&r1=822301&r2=822302&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/win32wrapper/windows/makefile (original)
+++ harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/win32wrapper/windows/makefile Tue Oct 6 14:57:42 2009
@@ -16,7 +16,7 @@
!include <$(HY_HDK)\build\make\defines.mak>
LIBBASE=Win32Wrapper
-DLLNAME=..\$(LIBBASE).dll
+DLLNAME=$(DLLPATH)$(LIBBASE).dll
LIBNAME=$(LIBPATH)$(LIBBASE).lib
HYLDFLAGS = $(HYLDFLAGS) -def:$(LIBBASE).def
Propchange: harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/winfont/
('svn:ignore' removed)
Modified: harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/winfont/windows/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/winfont/windows/makefile?rev=822302&r1=822301&r2=822302&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/winfont/windows/makefile (original)
+++ harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/winfont/windows/makefile Tue Oct 6 14:57:42 2009
@@ -18,7 +18,7 @@
!include <$(HY_HDK)\build\make\defines.mak>
LIBBASE=fontlib
-DLLNAME=..\$(LIBBASE).dll
+DLLNAME=$(DLLPATH)$(LIBBASE).dll
LIBNAME=$(LIBPATH)$(LIBBASE).lib
HYLDFLAGS = $(HYLDFLAGS) -def:$(LIBBASE).def
Propchange: harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/x11wrapper/
('svn:ignore' removed)
Modified: harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/x11wrapper/unix/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/x11wrapper/unix/makefile?rev=822302&r1=822301&r2=822302&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/x11wrapper/unix/makefile (original)
+++ harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/x11wrapper/unix/makefile Tue Oct 6 14:57:42 2009
@@ -32,7 +32,7 @@
OSLIBS += $(STDCLIBS) $(XLIBS)
-DLLNAME=../libX11Wrapper$(HY_SHLIB_SUFFIX)
+DLLNAME=$(DLLPATH)libX11Wrapper$(HY_SHLIB_SUFFIX)
EXPNAME=HYX11WRAPPER_0.1
include $(HY_HDK)/build/make/rules.mk