Blackwood Makefiles (mozilla/java/Makefile) need to be set up to
1. Build all Blackwood components - presently pluglets does not get built
2. Check if Commercial Build and
a) Version the Blackwood components
b) Put in separate DEST_PATH
I submitted, I accept
Added CC: edburns
Created attachment 15999 [details]
tar.gz of Modified Makefiles - untar in /mozilla
Created attachment 16000 [details] [diff] [review]
cvs diff -u of Modified Makefiles
3 files were modified and a new file runem_commercial.pl was added to src_share
directory. Now the java/Makefile builds util, dom, plugins and webclient in that
Also, the webclient/src_moz and webclient/classes_spec Makefiles version the
binaries, create the blackwood.jar and version it and move all the binaries to
the appropriate directory if the Env Variable PACKAGE_BUILD is set.
Ed, pls test this and let me know if I have r=a=edburns.
Created attachment 16555 [details] [diff] [review]
cvs diff -u of webclient/classes_spec/Makefile.in
Looks good. r=edburns.
Created attachment 16664 [details] [diff] [review]
cvs diff -u (changes in src_moz, classes_spec and java Makefiles)
Check this in.
Created attachment 16742 [details]
changed make files for pluglets
Makefiles for pluglets.
In case PACKAGE_BUILD is set
pluglet jars go to $(DIST)/javadev/examples
htmls for sample pluglets go to $(DIST)/javadev/html
data for sample pluglets go to $(DIST)/javadev/misc
In other case
pluglet jars go to $(DIST)/bin/plugins
htmls and data go to $(DIST)/bin/res/javadev/pluglets
In last case htmls are accesible via resource:///res/javadev/pluglets/
(resource:///res/javadev/pluglets/zip.html for example)
Created attachment 16743 [details] [diff] [review]
cvs diff -u of pluglets
Created attachment 16778 [details] [diff] [review]
cvs diff -u for Makefiles to fix build error
Igor, pls check in your changes if you haven't already. Shirley will do another
build today afternoon and by today evening, we should have all the build issues
Ed, your changes to java/Makefile.in (unjarring) does not work. If make sees a
export:: target in java/Makefile, it does not cd past the first Makefile in each
of the subdirs. i.e. only the Java Makefiles get built for all the projects and
neither the native code, nor the package directories get generated.
I have checked in changes to fix this and tested it. Pls let me know if I have
Sure, I'm sorry I broke this. r=a=edburns.
I just checked in makefiles for pluglets
Created attachment 16890 [details] [diff] [review]
cvs diff -u java/webclient/src_moz/Makefile.in
Last modification - minor change fo removing .so files from dist/bin
and dist/lib for commercial builds. they should be only in dist/javadev
Changes made to webclient/src_moz/Makefile.in
r=a=edburns for first 10/12 attachment.
Created attachment 16918 [details]
tar.gz of all files in this iteration.
Created attachment 16919 [details] [diff] [review]
Extract the dom jar before building anything, second iteration.
I've just attached a diff which I believe implements "unjar the w3c dom before
doing anything" functionality without breaking anything.
Can you please review the previous two attachments and if they work, can you
please check them in?
Created attachment 17989 [details] [diff] [review]
cvs diff -u of runem_commercial.pl
Created attachment 18271 [details] [diff] [review]
cvs diff -u for making commercial solaris package use .sh instead of .pl script
Cloding Bug. All changes required for PR3 are in place and the PR3 branch is
frozen. This bug may be reopened only for extra RTM packaging needs.
Created attachment 19557 [details] [diff] [review]
cvs diff -u for Blackconnect integration. Also added java/external/Makefile.in
Reopening for RTM
Posted fix to integrate Blackconnect into commercial solaris package
Closing Bug. After RTM, everything is in place for Blackwood packaging on