245623 - xslt.properties breaks camino objdir builds

Status: RESOLVED FIXED

(Camino Graveyard :: General, defect)

Description

[timeless]

2004-05-25 05:09:33.210 xcodebuild[8367] warning: work queue node
<node:0x13ef990:'/Users/timeless/obj-powerpc-apple-darwin7.3.1-camino/widget/src/cocoa/cursors/arrowN.tiff'[2]:Missing:0>
wants neither an invocation nor a subprocess -- ignoring it

PBXCp build/Camino.app/Contents/Resources/arrowN.tiff
/Users/timeless/obj-powerpc-apple-darwin7.3.1-camino/widget/src/cocoa/cursors/arrowN.tiff
    cd /Users/timeless/obj-powerpc-apple-darwin7.3.1-camino/camino
    /Developer/Tools/pbxcp -exclude .DS_Store -exclude CVS -strip-debug-symbols
-resolve-src-symlinks
/Users/timeless/obj-powerpc-apple-darwin7.3.1-camino/widget/src/cocoa/cursors/arrowN.tiff
/Users/timeless/obj-powerpc-apple-darwin7.3.1-camino/camino/build/Camino.app/Contents/Resources
/Users/timeless/obj-powerpc-apple-darwin7.3.1-camino/widget/src/cocoa/cursors:
No such file or directory
** BUILD FAILED **

This code is not objdir safe. my brand new build on my brand new mac is unhappy.

You probably want to have a Makefile.in in the cursors directory which symlinks
the files to the objdir when there's an objdir.sl

Comment 1

[timeless]

Attachment: install files in objdir

Comment 2

[Andrew Thompson]

Hrm, syntactically this new Makefile.in looks fine, but I must admit I'm not
really sure what its meant to achieve.

An objdir build is a way of building multiple binary versions of mozilla in the
same tree, correct? I know the cursors are picked up by the Camino.xcode project
and included. This is done using a relative path to widget/src/cocoa/cursor.

So what exactly does this Makefile.in do? Clearly it installs the cursors
somewhere... so is the idea to move the cursors to a known location for the
objdir build, and then the Camino.xcode project will pick them up from there?

If not, and this Makefile.in is intended to install the cursors to their final
build location, do you not also need to patch Camino.xcode to remove its file
include step?

Comment 3

[timeless]

the problem is that the xcode project is copied to the objdir, so it looks for 
the resources in $(OBJDIR)/widget/src/cocoa/cursors and they aren't there.

Comment 4

[timeless]

Attachment: alternate patch

Comment 5

[Ludovic Hirlimann [:Usul]]

Comment on attachment 150583 [details] [diff] [review]
alternate patch

>Index: Makefile.in
>===================================================================
>RCS file: /cvsroot//cvsroot/mozilla/widget/src/cocoa/Makefile.in,v
this confuses patch and I get :
bleu:~/Documents/sources/mozilla.org/xslt/mozilla ludo$ patch <../245623.asc 
patching file Makefile.in
Hunk #1 FAILED at 143.
1 out of 1 hunk FAILED -- saving rejects to file Makefile.in.rej
bleu:~/Documents/sources/mozilla.org/xslt/mozilla ludo$ 

once properly applied camino does not build :
/Users/ludo/Documents/sources/mozilla.org/xslt/mozilla/config/nsinstall -L
/Users/ludo/Documents/sources/mozilla.org/xslt/mozilla/widget/src/cocoa
./cursors .
/Users/ludo/Documents/sources/mozilla.org/xslt/mozilla/config/nsinstall: cannot
make symbolic link
/Users/ludo/Documents/sources/mozilla.org/xslt/mozilla/widget/src/cocoa/cursors
: File exists
make[6]: *** [export] Error 1
make[5]: *** [export] Error 2
make[4]: *** [export] Error 2
make[3]: *** [tier_9] Error 2
make[2]: *** [default] Error 2
make[1]: *** [build] Error 2
make: *** [build] Error 2

Comment 6

[Andrew Thompson]

timeless, sorry, my Internet connection was down all week.

Which patch do you want to move forward with?

Comment 7

[Ludovic Hirlimann [:Usul]]

nominating for 0.9
Lordpixel try both patches. I could not use second patch. I did not work.

Comment 8

[Andrew Thompson]

Perhaps an exercise in stating the obvious, but the reason the second patch
doesn't work is that it tries to link /cursors back over itself when you are NOT
building in objdir mode.

It probably works fine when you are building in objdir mode, but I didn't try
that just yet.

I'll see if I can think of a way around this, as the second patch requires less
ongoing maintaince.

Timeless, can you fix this problem?

Comment 9

[Andrew Thompson]

Attachment: Fix problem with timeless' second patch

Fixes timeless' second patch to test for existence of "cursors" directory
before trying to link it.

I've tried this in a regular source tree build, now I'll try objdir and report
back.

Comment 10

[Andrew Thompson]

Ok, so this is where my objdir style build died:

=== BUILDING BUNDLE TARGET Default Plugin USING BUILD STYLE Deployment ===
/Developer/Private/jam -d2 -j1
JAMBASE=/Developer/Makefiles/pbx_jamfiles/ProjectBuilderJambase JAMFILE=- build
ACTION=build _DEFAULT_GCC_VERSION=3.3 BUILD_STYLE=Deployment
"CPP_HEADERMAP_FILE=/Volumes/Mesa/Development/src_camino/objdir_test/modules/plugin/samples/default/mac/build/DefaultPlugin.build/Default
Plugin.build/Default Plugin.hmap"
SRCROOT=/Volumes/Mesa/Development/src_camino/objdir_test/modules/plugin/samples/default/mac
OBJROOT=/Volumes/Mesa/Development/src_camino/objdir_test/modules/plugin/samples/default/mac/build
SYMROOT=/Volumes/Mesa/Development/src_camino/objdir_test/modules/plugin/samples/default/mac/build
DSTROOT=/tmp/DefaultPlugin.dst

Missing file or directory: _NullPlugin.rsrc
** BUILD FAILED **
make[5]: *** [build-plugin] Error 1
make[4]: *** [libs] Error 2
make[3]: *** [tier_9] Error 2
make[2]: *** [default] Error 2
make[1]: *** [build] Error 2
make: *** [build] Error 2

Anyone know this one?

Comment 11

[Andrew Thompson]

Attachment: Next version ... fully tested

Ok, so here's another version.

I build this objdir, checked the build launched, 'make distclean', and then
built in the source tree.

Seems to work fine.

Comment 12

[Andrew Thompson]

Attachment: Fix another objdir problem with xslt

I pulled the tree today and by objdir build failed in transformix.
The additional change in the new patch fixes the problem.

Comment 13

[Josh Aas]

Can somebody on the review list look at this?

Comment 14

[Ludovic Hirlimann [:Usul]]

Peter is Xslt objdir broken ?

Comment 15

[Peter Van der Beken [:peterv]]

No, it isn't, but the way you include it from the Project Builder project
doesn't work in an objdir build. I'd rather not export the file like that. Can't
we do something similar to what is done for history.properties?

Comment 16

[Andrew Thompson]

(In reply to comment #15)
> No, it isn't, but the way you include it from the Project Builder project
> doesn't work in an objdir build. I'd rather not export the file like that. Can't
> we do something similar to what is done for history.properties?

I just did something that worked for me and got the project to compile.
If you have something in mind that works better and fits in with the way you
want the module to be built, then please do modify the patch.

Comment 17

[Mike Pinkerton (not reading bugmail)]

if peterv doesn't like the patch, i probably shouldn't sr. besides, i'm not an
sr for mozilla anyway.

Comment 18

[Mike Pinkerton (not reading bugmail)]

Comment on attachment 154894 [details] [diff] [review]
Fix another objdir problem with xslt

i can't sr. simon?

Comment 19

[Simon Fraser [no longer active]]

peterv?

Comment 20

[Peter Van der Beken [:peterv]]

I'd prefer if you did something similar to
http://lxr.mozilla.org/mozilla/source/camino/Camino.xcode/project.pbxproj#2134

Comment 21

[Mike Pinkerton (not reading bugmail)]

Comment on attachment 154894 [details] [diff] [review]
Fix another objdir problem with xslt

peterv says no, sr-

Comment 22

[Simon Fraser [no longer active]]

Hrm, my objdir build just went all the way through to camino (no problems in
widget or xslt).

Comment 23

[Simon Fraser [no longer active]]

I checked in fixes for the _NullPlugin.rsrc and widget/src/cocoa/cursors
problems. I'm not sure what the best solution is for the xslt issue. Suggestion
coming.

Comment 24

[Simon Fraser [no longer active]]

Attachment: symlink xslt.properties in objdir builds

Should we do this, like we do for the other objdir issues?

Comment 25

[Josh Aas]

Comment on attachment 171433 [details] [diff] [review]
symlink xslt.properties in objdir builds

pinging peterv by asking for a review of this patch - seems like he would be a
good reviewer

Comment 26

[Peter Van der Beken [:peterv]]

Huh, why is this assigned to me? I didn't break this and I've proposed a
different approach in comment 5. Is there something wrong with it? I don't
really see why we need to symlink a properties file in the objdir.

Comment 27

[Simon Fraser [no longer active]]

peterv: which jar file should we stuff xslt.properties into?
(Note that camino doesn't really need history.properties any more, so it's a
poor model.)

Comment 28

[Peter Van der Beken [:peterv]]

Normally embed.jar. But could you verify that it's not there already? Afaict we
package locale/XXXX/communicator/layout in embed.jar (looking at
http://lxr.mozilla.org/seamonkey/source/embedding/config/embed-jar.mn#47), and
xslt.properties should be at locale/en-US/communicator/layout/xslt.properties.

Comment 29

[Simon Fraser [no longer active]]

I see that xslt.properties now moved into DOM, which might make this easier.

Comment 30

[Simon Fraser [no longer active]]

Not a problem any more.

Comment 31

[Smokey Ardisson (offline for a while; not following bugs - do not email)]

Comment on attachment 150057 [details] [diff] [review]
install files in objdir

Clearing obsolete review flag on a fixed but; apologies for the bugspam.