JAR_KNOWS_ATFILE for BSD Project on OS X

[Andrew John Hughes]

2009/3/13 Michael Franz <mvfranz at gmail.com>:
> Hi,
>
> I think part of my problem is the current ecj patch
> (patches/ecj/icedtea.patch).  The first section has 3 parts to the if, the
> second only has 2.  The second ifneq (,$(JAR_KNOWS_ATFILE) has cm0f@ that is
> what causes my problem. The documenation I found does not say that jar
> understand @ as a parameter, but that you can use it to pass commands via a
> file using @.  Is this really a bad patch or do I not understand how @
> works?  Removing @ allows the build to continue, but the rt.jar is not
> created correctly (I will investigate).
>
> Michael
>
> @@ -651,10 +651,23 @@
>  $(RES_JAR_ARGLIST): $(RES_JAR_FILELIST)
>         $(prep-target)
>         $(SED) -e "s@^@-C $(CLASSBINDIR) @" $< > $@
> -$(RESOURCES_JAR): $(RES_JAR_ARGLIST) $(JAR_MANIFEST_FILE)
> +$(RESOURCES_JAR): \
> +    $(if $(JAR_KNOWS_ATFILE),$(RES_JAR_FILELIST),$(RES_JAR_ARGLIST)) \
> +    $(JAR_MANIFEST_FILE)
>         $(prep-target)
> +ifneq (,$(JAR_KNOWS_ATFILE))
> +       (cd $(CLASSBINDIR) && \
>         $(BOOT_JAR_CMD) c0mf $(JAR_MANIFEST_FILE) $@ \
> -           @$(RES_JAR_ARGLIST) $(BOOT_JAR_JFLAGS)
> +           $(JAR_JFLAGS) @$(RES_JAR_FILELIST))
> +else ifneq (,$(JAR_ACCEPTS_STDIN_LIST))
> +       (cd $(CLASSBINDIR) && $(CAT) $(RES_JAR_FILELIST) | \
> +       $(BOOT_JAR_CMD) c0mf@ $(JAR_MANIFEST_FILE) $@ \
> +           $(JAR_JFLAGS))
> +else
> +       (cd $(CLASSBINDIR) && \
> +       $(BOOT_JAR_CMD) c0mf $(JAR_MANIFEST_FILE) $@ \
> +           $(JAR_JFLAGS) `cat $(RES_JAR_FILELIST)`)
> +endif
>         @$(java-vm-cleanup)
>
>  # Create jsse.jar containing SunJSSE implementation classes
> @@ -710,10 +723,18 @@
>  $(RT_JAR_ARGLIST): $(RT_JAR_FILELIST)
>         $(prep-target)
>         $(SED) -e "s@^@-C $(CLASSBINDIR) @" $< > $@
> -$(RT_JAR): $(RT_JAR_ARGLIST) $(JAR_MANIFEST_FILE)
> +$(RT_JAR): $(if $(JAR_KNOWS_ATFILE),$(RT_JAR_FILELIST),$(RT_JAR_ARGLIST)) \
> +     $(JAR_MANIFEST_FILE)
>         $(prep-target)
> +ifneq (,$(JAR_KNOWS_ATFILE))
> +       (cd $(CLASSBINDIR) && $(CAT) $(RT_JAR_FILELIST) | \
> +       $(BOOT_JAR_CMD) c0mf@ $(JAR_MANIFEST_FILE) $@ \
> +           $(BOOT_JAR_JFLAGS))
> +else
> +       (cd $(CLASSBINDIR) && \
>         $(BOOT_JAR_CMD) c0mf $(JAR_MANIFEST_FILE) $@ \
> -           @$(RT_JAR_ARGLIST) $(BOOT_JAR_JFLAGS)
> +           $(BOOT_JAR_JFLAGS) `$(CAT) $(RT_JAR_FILELIST)`)
> +endif
>         @$(java-vm-cleanup)
>
>  # Meta-index construction to make core class loaders lazier
>
>
>
> On Sun, Mar 1, 2009 at 7:53 PM, Andrew John Hughes
> <gnu_andrew at member.fsf.org> wrote:
>>
>> 2009/3/1 Michael Franz <mvfranz at gmail.com>:
>> > Hi,
>> >
>> > I am having problems getting this to work when not building using an
>> > OpenJDK
>> > (Apples JDK 5).  I have also not been able to find any documentation on
>> > this.  Does anyone have a link for this?  This is the only part of the
>> > build
>> > I have not been able to get to work cleanly when building Zero on the
>> > BSD-Port repo using OS X.
>> >
>> > One other issue I is getting /opt/local/include and /opt/local/lib into
>> > the
>> > build.  I have defined CFLAGS/CXXFLAGS/CPPFLAGS/INCLUDES/LIBS (different
>> > combinations) and they all fix parts of the build but break others.
>> > What is
>> > the proper way to add and include and link directory?
>> >
>> > Michael
>> >
>>
>> It was added by Matthias I believe, and is related to the configure
>> check as to whether jar supports @file arguments or not.
>> --
>> Andrew :-)
>>
>> Free Java Software Engineer
>> Red Hat, Inc. (http://www.redhat.com)
>>
>> Support Free Java!
>> Contribute to GNU Classpath and the OpenJDK
>> http://www.gnu.org/software/classpath
>> http://openjdk.java.net
>>
>> PGP Key: 94EFD9D8 (http://subkeys.pgp.net)
>> Fingerprint: F8EF F1EA 401E 2E60 15FA  7927 142C 2591 94EF D9D8
>
>

gjar understands @ as an option to read from stdin.  OpenJDK jar
doesn't but does understand @.  Older versions of gjar don't
understand @file so the @ option is used.

configure should pick the right one for your setup.  That's where you
need to look for why the wrong thing is being picked.

It sets:

JAR_KNOWS_ATFILE - jar supports @file
JAR_ACCEPTS_STDIN_LIST - jar supports reading from stdin with the @ option

If neither is set, then the list is expanded, which runs into argument
length issues.

This is one of the cleaner examples... there are quite a few
assumptions made by IcedTea that I would like to slowly unpick and
correctly change into appropriate configure checks.
The current plan is to release what we currently have, based on b50,
and then do this as part of the cleanup process of moving to the new
IcedTea forest - http://hg.openjdk.java.net/icedtea/jdk7

How do you fare with straight OpenJDK from Mercurial? The best target
might to be work against the new forest and see what patches are
needed there to get a working build.
IcedTea has to deal with old bugs in the GNU tools which aren't
relevant for new versions (but are for those in distros), which makes
the process unnecessarily hairier.
-- 
Andrew :-)

Free Java Software Engineer
Red Hat, Inc. (http://www.redhat.com)

Support Free Java!
Contribute to GNU Classpath and the OpenJDK
http://www.gnu.org/software/classpath
http://openjdk.java.net

PGP Key: 94EFD9D8 (http://subkeys.pgp.net)
Fingerprint: F8EF F1EA 401E 2E60 15FA  7927 142C 2591 94EF D9D8