54129 - Blackwood Makefiles need to be modified for commercial builds

Status: RESOLVED FIXED

(Core Graveyard :: Java APIs to WebShell, defect, P3)

Description

[Ashu Kulkarni]

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

Comment 1

[Ashu Kulkarni]

I submitted, I accept

Comment 2

[edburns]

Added CC: edburns

Comment 3

[Ashu Kulkarni]

Attachment: tar.gz of Modified Makefiles - untar in /mozilla

Comment 4

[Ashu Kulkarni]

Attachment: cvs diff -u of Modified Makefiles

Comment 5

[Ashu Kulkarni]

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
order.

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.


thanks
_Ashu

Comment 6

[Ashu Kulkarni]

Attachment: cvs diff -u of webclient/classes_spec/Makefile.in

Comment 7

[edburns]

Looks good.  r=edburns.

Comment 8

[Ashu Kulkarni]

Attachment: cvs diff -u (changes in src_moz, classes_spec and java Makefiles)

Comment 9

[edburns]

r=edburns
a=edburns

Check this in.

Comment 10

[Igor Kushnirskiy]

Attachment: changed make files for pluglets

Comment 11

[Igor Kushnirskiy]

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)

Comment 12

[Igor Kushnirskiy]

Attachment: cvs diff -u of pluglets

Comment 13

[Ashu Kulkarni]

Attachment: cvs diff -u for Makefiles to fix build error

Comment 14

[Ashu Kulkarni]

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
resolved.

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
r=a=edburns

thanks
_Ashu

Comment 15

[edburns]

Sure, I'm sorry I broke this.  r=a=edburns.

Comment 16

[Igor Kushnirskiy]

I just checked in makefiles for pluglets
Thanks,
  Igor

Comment 17

[Ashu Kulkarni]

Attachment: cvs diff -u java/webclient/src_moz/Makefile.in

Comment 18

[Ashu Kulkarni]

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

_Ashu

Comment 19

[edburns]

r=a=edburns for first 10/12 attachment.

Comment 20

[edburns]

Attachment: tar.gz of all files in this iteration.

Comment 21

[edburns]

Attachment: Extract the dom jar before building anything, second iteration.

Comment 22

[edburns]

Hi Ashu,

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?

Thanks,

Ed

Comment 23

[Ashu Kulkarni]

Attachment: cvs diff -u of runem_commercial.pl

Comment 24

[Ashu Kulkarni]

Attachment: cvs diff -u for making commercial solaris package use .sh instead of .pl script

Comment 25

[Ashu Kulkarni]

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.

Comment 26

[Ashu Kulkarni]

Attachment: cvs diff -u for Blackconnect integration. Also added java/external/Makefile.in

Comment 27

[Ashu Kulkarni]

Reopening for RTM

Posted fix to integrate Blackconnect into commercial solaris package

Comment 28

[Ashu Kulkarni]

Closing Bug. After RTM, everything is in place for Blackwood packaging on 
Solaris