hg: build-infra/jdk8/jdk: 14 new changesets

erik.joelsson at oracle.com erik.joelsson at oracle.com
Wed May 23 05:39:30 PDT 2012 

Changeset: 1d6292cb2927
Author:    jonas
Date:      2012-05-16 11:41 +0200
URL:       http://hg.openjdk.java.net/build-infra/jdk8/jdk/rev/1d6292cb2927

add GenerateNativeHeader annotations for core jobjc classes. This also means that the haskel script generating them is modified. And build.xml (ant) is modified to add the annotations on the classpath (since they are compiled with boot-jdk)

! src/macosx/native/jobjc/build.xml
! src/macosx/native/jobjc/src/core/PrimitiveCoder.hs
! src/macosx/native/jobjc/src/core/java/com/apple/jobjc/CFType.java
! src/macosx/native/jobjc/src/core/java/com/apple/jobjc/Coder.java
! src/macosx/native/jobjc/src/core/java/com/apple/jobjc/FFIType.java
! src/macosx/native/jobjc/src/core/java/com/apple/jobjc/Function.java
! src/macosx/native/jobjc/src/core/java/com/apple/jobjc/ID.java
! src/macosx/native/jobjc/src/core/java/com/apple/jobjc/Invoke.java
! src/macosx/native/jobjc/src/core/java/com/apple/jobjc/JObjCRuntime.java
! src/macosx/native/jobjc/src/core/java/com/apple/jobjc/MacOSXFramework.java
! src/macosx/native/jobjc/src/core/java/com/apple/jobjc/NSClass.java
! src/macosx/native/jobjc/src/core/java/com/apple/jobjc/NativeArgumentBuffer.java
! src/macosx/native/jobjc/src/core/java/com/apple/jobjc/NativeBuffer.java
! src/macosx/native/jobjc/src/core/java/com/apple/jobjc/NativeObjectLifecycleManager.java
! src/macosx/native/jobjc/src/core/java/com/apple/jobjc/Opaque.java
! src/macosx/native/jobjc/src/core/java/com/apple/jobjc/Pointer.java
! src/macosx/native/jobjc/src/core/java/com/apple/jobjc/PrimitiveCoder.java
! src/macosx/native/jobjc/src/core/java/com/apple/jobjc/SEL.java
! src/macosx/native/jobjc/src/core/java/com/apple/jobjc/Struct.java
! src/macosx/native/jobjc/src/core/java/com/apple/jobjc/Subclassing.java

Changeset: 6964e7daffb6
Author:    jonas
Date:      2012-05-16 11:42 +0200
URL:       http://hg.openjdk.java.net/build-infra/jdk8/jdk/rev/6964e7daffb6

modify code generation to sort output before output, to get stable output for easy comparison new/old

! src/macosx/native/jobjc/src/generator/java/com/apple/internal/jobjc/generator/classes/FrameworkClassFile.java
! src/macosx/native/jobjc/src/generator/java/com/apple/internal/jobjc/generator/model/Clazz.java
! src/macosx/native/jobjc/src/generator/java/com/apple/internal/jobjc/generator/model/coders/ComplexCoderDescriptor.java

Changeset: b58d4d0632f6
Author:    jonas
Date:      2012-05-16 12:12 +0200
URL:       http://hg.openjdk.java.net/build-infra/jdk8/jdk/rev/b58d4d0632f6

convert java/jobjc/Makefile

! makefiles/CompileJavaClasses.gmk
! makefiles/CompileNativeLibraries.gmk
! makefiles/GenerateJavaSources.gmk
+ makefiles/GensrcJObjC.gmk
! makefiles/java/Makefile
- makefiles/java/jobjc/Makefile

Changeset: 3734a6bc2d8f
Author:    jonas
Date:      2012-05-16 12:48 +0200
URL:       http://hg.openjdk.java.net/build-infra/jdk8/jdk/rev/3734a6bc2d8f

merge main

! makefiles/CompileJavaClasses.gmk
! makefiles/CompileNativeLibraries.gmk
! makefiles/GenerateJavaSources.gmk
- src/macosx/bin/amd64/jvm.cfg
- src/share/classes/sun/security/action/LoadLibraryAction.java
- test/sun/security/pkcs11/nss/lib/linux-amd64/libfreebl3.chk
- test/sun/security/pkcs11/nss/lib/linux-amd64/libfreebl3.so
- test/sun/security/pkcs11/nss/lib/linux-amd64/libnspr4.so
- test/sun/security/pkcs11/nss/lib/linux-amd64/libnss3.so
- test/sun/security/pkcs11/nss/lib/linux-amd64/libnssckbi.so
- test/sun/security/pkcs11/nss/lib/linux-amd64/libplc4.so
- test/sun/security/pkcs11/nss/lib/linux-amd64/libplds4.so
- test/sun/security/pkcs11/nss/lib/linux-amd64/libsoftokn3.chk
- test/sun/security/pkcs11/nss/lib/linux-amd64/libsoftokn3.so
- test/sun/security/pkcs11/nss/lib/linux-i586/libnspr4.so
- test/sun/security/pkcs11/nss/lib/linux-i586/libnss3.so
- test/sun/security/pkcs11/nss/lib/linux-i586/libnssckbi.so
- test/sun/security/pkcs11/nss/lib/linux-i586/libplc4.so
- test/sun/security/pkcs11/nss/lib/linux-i586/libplds4.so
- test/sun/security/pkcs11/nss/lib/linux-i586/libsoftokn3.so
- test/sun/security/pkcs11/nss/lib/solaris-amd64/libnspr4.so
- test/sun/security/pkcs11/nss/lib/solaris-amd64/libnss3.so
- test/sun/security/pkcs11/nss/lib/solaris-amd64/libnssckbi.so
- test/sun/security/pkcs11/nss/lib/solaris-amd64/libplc4.so
- test/sun/security/pkcs11/nss/lib/solaris-amd64/libplds4.so
- test/sun/security/pkcs11/nss/lib/solaris-amd64/libsoftokn3.so
- test/sun/security/pkcs11/nss/lib/solaris-i586/libfreebl3.so
- test/sun/security/pkcs11/nss/lib/solaris-i586/libnspr4.so
- test/sun/security/pkcs11/nss/lib/solaris-i586/libnss3.so
- test/sun/security/pkcs11/nss/lib/solaris-i586/libnssckbi.so
- test/sun/security/pkcs11/nss/lib/solaris-i586/libplc4.so
- test/sun/security/pkcs11/nss/lib/solaris-i586/libplds4.so
- test/sun/security/pkcs11/nss/lib/solaris-i586/libsoftokn3.so
- test/sun/security/pkcs11/nss/lib/solaris-sparc/libfreebl_hybrid_3.chk
- test/sun/security/pkcs11/nss/lib/solaris-sparc/libfreebl_hybrid_3.so
- test/sun/security/pkcs11/nss/lib/solaris-sparc/libnspr4.so
- test/sun/security/pkcs11/nss/lib/solaris-sparc/libnss3.so
- test/sun/security/pkcs11/nss/lib/solaris-sparc/libnssckbi.so
- test/sun/security/pkcs11/nss/lib/solaris-sparc/libplc4.so
- test/sun/security/pkcs11/nss/lib/solaris-sparc/libplds4.so
- test/sun/security/pkcs11/nss/lib/solaris-sparc/libsoftokn3.chk
- test/sun/security/pkcs11/nss/lib/solaris-sparc/libsoftokn3.so
- test/sun/security/pkcs11/nss/lib/solaris-sparcv9/libnspr4.so
- test/sun/security/pkcs11/nss/lib/solaris-sparcv9/libnss3.so
- test/sun/security/pkcs11/nss/lib/solaris-sparcv9/libnssckbi.so
- test/sun/security/pkcs11/nss/lib/solaris-sparcv9/libplc4.so
- test/sun/security/pkcs11/nss/lib/solaris-sparcv9/libplds4.so
- test/sun/security/pkcs11/nss/lib/solaris-sparcv9/libsoftokn3.so
- test/sun/security/pkcs11/nss/lib/windows-i586/libnspr4.dll
- test/sun/security/pkcs11/nss/lib/windows-i586/libplc4.dll
- test/sun/security/pkcs11/nss/lib/windows-i586/libplds4.dll
- test/sun/security/pkcs11/nss/lib/windows-i586/nss3.dll
- test/sun/security/pkcs11/nss/lib/windows-i586/nssckbi.dll
- test/sun/security/pkcs11/nss/lib/windows-i586/softokn3.dll
- test/tools/pack200/dyn.jar
- test/tools/pack200/pack200-verifier/src/xmlkit/ClassSyntax.java
- test/tools/pack200/pack200-verifier/src/xmlkit/ClassWriter.java
- test/tools/pack200/pack200-verifier/src/xmlkit/InstructionAssembler.java
- test/tools/pack200/pack200-verifier/src/xmlkit/InstructionSyntax.java

Changeset: 0f05f15e0fb4
Author:    jonas
Date:      2012-05-21 10:24 +0200
URL:       http://hg.openjdk.java.net/build-infra/jdk8/jdk/rev/0f05f15e0fb4

post merge macosx fixes

! makefiles/CompileJavaClasses.gmk
! makefiles/CompileNativeLibraries.gmk
! makefiles/CreateJars.gmk
! makefiles/Images.gmk

Changeset: 4af0209c06e7
Author:    jonas
Date:      2012-05-21 10:32 +0200
URL:       http://hg.openjdk.java.net/build-infra/jdk8/jdk/rev/4af0209c06e7

merge main

! makefiles/CompileJavaClasses.gmk
! makefiles/CompileNativeLibraries.gmk
! makefiles/GenerateJavaSources.gmk
! makefiles/Images.gmk
- makefiles/com/Makefile
- makefiles/javax/Makefile

Changeset: 0317354d19c1
Author:    jonas
Date:      2012-05-21 14:19 +0200
URL:       http://hg.openjdk.java.net/build-infra/jdk8/jdk/rev/0317354d19c1

more macosx fixes...i think it now also works

! makefiles/CompileJavaClasses.gmk
! makefiles/CompileLaunchers.gmk
! makefiles/CopyFiles.gmk
! makefiles/common/Release.gmk

Changeset: a33f6cef26cc
Author:    jonas
Date:      2012-05-21 16:37 +0200
URL:       http://hg.openjdk.java.net/build-infra/jdk8/jdk/rev/a33f6cef26cc

fix install-file on macosx

! makefiles/CompileLaunchers.gmk
! makefiles/CompileNativeLibraries.gmk
! makefiles/Images.gmk

Changeset: 5967717501f7
Author:    jonas
Date:      2012-05-22 10:11 +0200
URL:       http://hg.openjdk.java.net/build-infra/jdk8/jdk/rev/5967717501f7

fix shared library dependencies on linux/macosx

! makefiles/CompileNativeLibraries.gmk
! makefiles/Images.gmk

Changeset: f868d00babac
Author:    jonas
Date:      2012-05-22 11:18 +0200
URL:       http://hg.openjdk.java.net/build-infra/jdk8/jdk/rev/f868d00babac

fix lib dependency for AppleScriptEngine

! makefiles/CompileNativeLibraries.gmk

Changeset: 638824d108d6
Author:    jonas
Date:      2012-05-22 12:32 +0200
URL:       http://hg.openjdk.java.net/build-infra/jdk8/jdk/rev/638824d108d6

fix typo in libdep for jaas_unix

! makefiles/CompileNativeLibraries.gmk

Changeset: 4c80cae23f2e
Author:    jonas
Date:      2012-05-22 13:24 +0200
URL:       http://hg.openjdk.java.net/build-infra/jdk8/jdk/rev/4c80cae23f2e

fixes for problems found when running --with-data-model=64 on solaris

! makefiles/CompileNativeLibraries.gmk
! makefiles/GensrcMisc.gmk
! makefiles/GensrcX11Wrappers.gmk

Changeset: 9ecfbf0a6a5f
Author:    jonas
Date:      2012-05-23 11:26 +0200
URL:       http://hg.openjdk.java.net/build-infra/jdk8/jdk/rev/9ecfbf0a6a5f

1) don't build jli_static when it's not needed. 2) fix -O2 on libmanagement

! makefiles/CompileNativeLibraries.gmk

Changeset: e5f38231f9be
Author:    erikj
Date:      2012-05-23 14:32 +0200
URL:       http://hg.openjdk.java.net/build-infra/jdk8/jdk/rev/e5f38231f9be

Merge

! makefiles/CompileNativeLibraries.gmk
! makefiles/GensrcMisc.gmk
! makefiles/Images.gmk
- makefiles/java/jobjc/Makefile

More information about the build-infra-dev mailing list