James McCoy

* STATUS: Nominate r1863987, r1863990.
* STATUS: Nominate r1863987, r1863990.
Fix link flags and include directory in pkg-config template

* build/generator/gen_make.py

(write_pkg_config_dot_in_files): Add version variable for template.

Include version in link flag for svn lib.

* build/generator/templates/pkg-config.in.ezt:

(): Add /subversion-1 to include path

Fix format of Requires(.private) fields in pkg-config files

Per pkg-config(1), the field "is a comma-separated list of packages that are

required by your package", not a space-separated field.

* build/generator/templates/pkg-config.in.ezt

(): Generate comma-separated lists for Requires(.private)

* configure.ac:

(old_gnome_keyring): Use a comma separated list for SVN_GNOME_KEYRING_PCLIBS

Fix various warnings in javahl

[in subversion/bindings/javahl]

* src/org/apache/subversion/javahl/types/RevisionRange.java,

tests/org/apache/subversion/javahl/BasicTests.java,

tests/org/apache/subversion/javahl/SVNRemoteTests.java:

Use "Long.valueOf(long)" instead of deprecated "new Long(long)"

* native/RemoteSession.cpp, native/RemoteSession.h,

native/org_apache_subversion_javahl_remote_RemoteSession.cpp,

native/org_apache_subversion_javahl_util_ConfigImpl_Category.cpp,

native/org_apache_subversion_javahl_util_PropLib.cpp: Rename "jvalue"

variables to fix -Wshadow warnings for jvalue symbol in jni.h

* site-nav.html: Bump the copyright year in the navigation.
* STATUS: Vote +1 on r1842090, approving.
* publish/docs/release-notes/1.11.html

(javahl): New section, document Java 10 compatibility and Java 8 build

requirement.

* STATUS: Vote +1 on the r1841059 group, approving.
* STATUS: Unapprove r1841180 group since it needs 3 votes due to touching build system

* STATUS:

Vote +1 on the r1841180 group, approving.

Vote -0 on the r1841059 group, merge conflicts and .svn/x/ is still being used

* STATUS: Nominate r1841180.
* STATUS:

Vote +1 on r1841059.

Vote +1 on the r1841091 group.

Vote +1 on r1841098.

Vote +1 on r1841272.

Remove 'java10-compat' branch, merged to trunk in r1841180
Merge the 'java10-compat' branch to trunk
On the 'java10-compat' branch: Catch up with trunk @1841178
    • ?
    /branches/java10-compat/subversion/libsvn_client/shelf.c
    • ?
    /branches/java10-compat/subversion/svn/svn.c
    • ?
    /branches/java10-compat/tools/dist/release.py
    • ?
    /branches/java10-compat/subversion/include/svn_version.h
  1. … 5 more files in changeset.
On the 'java10-compat' branch:

* build/generator/gen_win.py

(get_proj_sources): Format all variables when building TargetJava's build

command-line, to make it clear that relevant whitespace exists between

arguments.

On the 'java10-compat' branch:

* build/generator/gen_win.py

(get_proj_sources): Access headers from Target object rather than Generator

On the 'java10-compat' branch: Add initial support for building with Java 10

Java 10 removed the javah tool, moving the functionality of generating header

files for native code into javac behind the -h switch. One command

invocation will both compile the class files and generate the native headers.

To support this, build.conf's java and javah types have been combined into a

single java type. If there are java files with native code, they need to be

explicitly declared in the new "native" attribute to allow defining a

dependency between the generated header file and the java file.

Unlike javah, javac will only produce header files for source files that

actually have native content, so there is not a 1:1 relationship between .java

and .h files. This also means that the .java files which don't directly have

native code, but which provide fields used by native code need to be properly

annotated.

* build.conf

(javahl-javah, javahl-callback-javah, javahl-remote-javah, javahl-types-javah):

Remove in favor of...

(javahl-java, javahl-callback-java, javahl-remote-java, javahl-types-java):

Add native attribute declaring files with native content, and headers

attribute for location of generated header files.

(javahl-compat-java): List all dependencies now that the javahl-java target

doesn't aggregate all of its sub-packages.

(libsvnjavahl): Rename *_javah_DEPS to *_java_DEPS

* build/generator/gen_base.py

(TargetJavaHeaders, TargetJavaClasses): Remove and merge their functionality

together into a single TargetJava class.

(TargetJava): Remove support for package-roots attribute. Add handling for

native attribute. If native content exists for a target, an additional

DT_LINK object is added to the graph for the header file.

* build/generator/gen_make.py

(write): Propagate the headers_dir attribute from target_ob into ezt_target.

* build/generator/gen_win.py

(get_install_targets): Remove check for TargetJavaHeaders type

(get_proj_sources): Remove checks for/uses of javah executable. Replace

TargetJavaClasses/TargetJavaHeaders checks with one for TargetJava. Add

"-h headers_dir" to javac command if target has headers location defined.

Set ctarget/cdesc for the project item based on the object type being

created.

(get_output_dir): Use the classes directory for all TargetJava targets,

since class files will always be created.

* build/generator/templates/build-outputs.mk.ezt

(target.type "java"): Merge the target's _HEADERS and _OBJECTS rules into

one, which only depends on the _SRC files. The link_cmd will include

"-h headers_dir" if the target has a headers_dir attribute.

* Makefile.in

(): Remove COMPILE_JAVAHL_JAVAH and JAVAH

    • ?
    /branches/java10-compat/build/generator/gen_base.py
    • ?
    /branches/java10-compat/build/generator/gen_win.py
    • ?
    /branches/java10-compat/build/generator/gen_make.py
    • ?
    /branches/java10-compat/Makefile.in
Create the 'java10-compat' branch
* STATUS:

Vote +1 on r1830882, approving.

Vote +1 on r1833465.

Vote +1 on the 1.10.x-issue4758 branch.

Vote +1 on r1835760, approving.

* build/generator/gen_base.py

(TargetJavaClasses.add_dependencies): Reverse check for valid filename to

fail early and avoid an extra level of indentation. No functional change.

* subversion/libsvn_wc/wc_deb_wcroot.c

(svn_wc__db_wcroot_parse_local_abspath) Use an iterpool while trying to find

the abspath of the wcroot

Fix use of implicit path when calling shelf-{list,log,drop} from a wc-subdir

* subversion/svn/shelf-cmd.c:

(svn_cl__shelf_list, svn_cl__shelf_drop, svn_cl__shelf_log): Convert targets

to absolute paths

* subversion/tests/cmdline/shelf_tests.py:

(shelve_unshelve_verify): Add an assertion for "svn shelves"

Bump minimum JDK version required for JavaHL to 1.8, in preparation for the

changes needed to support Java 10

* subversion/bindings/javahl/README

(): Update JDK version requirements.

* configure.ac

(JAVA_OLDEST_WORKING_VER): Set to 1.8

* build/ac-macros/java.m4

(SVN_FIND_JDK): Set Java source version to 1.8.

* build/generator/gen_win.py

(get_proj_sources): Set Java source and target version to 1.8.

Add @Native annotations to ensure header files are generated when using "javac -h".

Unlike javah, which generates header files corresponding to all of the classes

it's pointed at, "javac -h" only generates a header file if there is native

content.

[in subversion/bindings/src/org/apache/subversion/javahl]

* CommitItemStateFlags.java:

(): Add @Native annotation to all flags

* callback/UserPasswordCallback.java:

(Reject, AcceptTemporary, AcceptPermanently): Add @Native annotation

* types/Revision.java:

(SVN_INVALID_REVNUM): Add @Native annotation

Patch by: Emmanuel Bourg <ebourg_{AT}_apache.org>

* STATUS: Nominate r1829260.
* build/ac-macros/swig.m4: Revert r1751167, since it broke use of pre-generated

Swig bindings in release builds.

* tools/dist/backport.pl: Continue chasing the experimental nature of 'given'

and 'when', through perl5261delta.

* STATUS: Vote +1 on the r1825979 group, approving.