14 Commits

Author SHA1 Message Date
edburns%acm.org
acfdb6daf6 fix makefiles, remove external dom
git-svn-id: svn://10.0.0.236/trunk@217594 18797224-902f-48f8-a5cc-f745e15eee43
2007-01-02 03:11:23 +00:00
edburns%acm.org
62d191460c Make plugletjni.lib and .dll build.
M makefiles

- remove plugins/Makefile, this'll be replaced by ant

- add jni Makefile

R plugins/makefile.win
R plugins/jni/makefile.win
R plugins/src/makefile.win

- obsolete.

M plugins/jni/Makefile.in

- new includes and such

M plugins/jni/org_mozilla_pluglet_mozilla_PlugletOutputStream.cpp

- cast to const char *.


git-svn-id: svn://10.0.0.236/trunk@192921 18797224-902f-48f8-a5cc-f745e15eee43
2006-03-24 17:57:24 +00:00
edburns%acm.org
4cf929cbd3 This change-bundle starts the process of re-activating pluglets.
Next step is to figure out the best way to fix these unresolved symbols
at link time when building pluglet.dll

/cygdrive/d/Projects/mozilla/MOZILLA_NIH/FIREFOX_1_5_0_1/mozilla/./build/cygwin-wrapper link -NOLOGO -DLL -OUT:pluglet.dll -PDB:pluglet.pdb -SUBSYSTEM:WINDOWS  List.obj Pluglet.obj PlugletEngine.obj PlugletFactory.obj PlugletInputStream.obj PlugletLoader.obj PlugletManager.obj PlugletPeer.obj PlugletStreamInfo.obj PlugletStreamListener.obj PlugletsDir.obj Registry.obj PlugletViewFactory.obj   ./module.res   -DEBUG -DEBUGTYPE:CV         kernel32.lib user32.lib gdi32.lib winmm.lib wsock32.lib advapi32.lib D:\Files_2k\j2sdk1.4.2_03/lib/jvm.lib ../../../dist/lib/xpcom.lib ../../../dist/lib/xpcom_core.lib ../../../dist/lib/nspr4.lib ../../../dist/lib/plc4.lib ../../../dist/lib/plds4.lib
   Creating library pluglet.lib and object pluglet.exp
PlugletsDir.obj : error LNK2001: unresolved external symbol "__declspec(dllimport) public: virtual __thiscall nsFileSpec::~nsFileSpec(void)" (__imp_??1nsFileSpec@@UAE@XZ)
PlugletsDir.obj : error LNK2001: unresolved external symbol "__declspec(dllimport) public: virtual __thiscall nsDirectoryIterator::~nsDirectoryIterator(void)" (__imp_??1nsDirectoryIterator@@UAE@XZ)
PlugletsDir.obj : error LNK2001: unresolved external symbol "__declspec(dllimport) public: class nsDirectoryIterator & __thiscall nsDirectoryIterator::operator++(void)" (__imp_??EnsDirectoryIterator@@QAEAAV0@XZ)
PlugletsDir.obj : error LNK2001: unresolved external symbol "__declspec(dllimport) public: __thiscall nsDirectoryIterator::nsDirectoryIterator(class nsFileSpec const &,int)" (__imp_??0nsDirectoryIterator@@QAE@ABVnsFileSpec@@H@Z)
PlugletsDir.obj : error LNK2001: unresolved external symbol "__declspec(dllimport) public: __thiscall nsFileSpec::nsFileSpec(char const *,int)" (__imp_??0nsFileSpec@@QAE@PBDH@Z)
PlugletsDir.obj : error LNK2001: unresolved external symbol "__declspec(dllimport) public: virtual __thiscall nsSpecialSystemDirectory::~nsSpecialSystemDirectory(void)" (__imp_??1nsSpecialSystemDirectory@@UAE@XZ)
PlugletsDir.obj : error LNK2001: unresolved external symbol "__declspec(dllimport) public: void __thiscall nsFileSpec::operator+=(char const *)" (__imp_??YnsFileSpec@@QAEXPBD@Z)
PlugletsDir.obj : error LNK2001: unresolved external symbol "__declspec(dllimport) public: __thiscall nsSpecialSystemDirectory::nsSpecialSystemDirectory(enum nsSpecialSystemDirectory::SystemDirectories)" (__imp_??0nsSpecialSystemDirectory@@QAE@W4SystemDirectories@0@@Z)
PlugletsDir.obj : error LNK2001: unresolved external symbol "__declspec(dllimport) public: char const * __thiscall nsFileSpec::GetCString(void)const " (__imp_?GetCString@nsFileSpec@@QBEPBDXZ)
PlugletViewFactory.obj : error LNK2001: unresolved external symbol "public: __thiscall PlugletViewWindows::PlugletViewWindows(void)" (??0PlugletViewWindows@@QAE@XZ)
pluglet.dll : fatal error LNK1120: 10 unresolved externals

M makefiles

+java/plugins/Makefile
+java/plugins/src/Makefile

Add generation of these Makefiles

M plugins/src/Makefile.in

- copy some content from webclient

M plugins/src/Pluglet.cpp
M plugins/src/PlugletEngine.cpp
M plugins/src/PlugletStreamListener.cpp

- Changes from John Sublet.


git-svn-id: svn://10.0.0.236/trunk@192678 18797224-902f-48f8-a5cc-f745e15eee43
2006-03-21 03:25:34 +00:00
edburns%acm.org
3d7dee72f2 r=edburns
Author: Ron Capelli <capelli@acm.org>

The following files are updated to allow use of IBM Java 1.3.x
JVMs on Linux.  Instead of statically linking libjawt.lib, the
code now dynamically links libjawt.so and then libawt.so only
if needed (similar to previous change for win32).  It should
work on Solaris, but we couldn't test that here.

    mozilla/java/webclient/src_moz/Makefile.in
    mozilla/java/webclient/src_moz/gtk/GtkBrowserControlCanvas.cpp

The following files are changed to support the ant 'clean'
target for src_ie.

    mozilla/java/webclient/build.xml
    mozilla/java/webclient/src_ie/Makefile.in

The following files are changed to disable the CurrentPage(2)
interface for IE, since it will be a while before that can be
made to work.  With these changes, IE embeds smoothly with
Navigation and History interfaces working nicely to some degree.

    mozilla/java/webclient/src_ie/WrapperFactoryImpl.cpp

mozilla/java/webclient/classes_spec/org/mozilla/webclient/test/EMWindow.java

The following file is changed so that it does not depend on
Mozilla, allowing it to be shared cleanly for IE.

    mozilla/java/webclient/src_moz/win32/Win32BrowserControlCanvas.cpp

The following file is changed to correct the list of makefiles
that need to be configured for Webclient.

    mozilla/java/makefiles

Finally, please delete the following files from CVS.

    mozilla/java/webclient/src_ie/build.xml
    mozilla/java/webclient/src_ie/Makefile.win


git-svn-id: svn://10.0.0.236/trunk@142382 18797224-902f-48f8-a5cc-f745e15eee43
2003-05-13 20:22:13 +00:00
edburns%acm.org
8a064f3f42 gtk
git-svn-id: svn://10.0.0.236/trunk@135789 18797224-902f-48f8-a5cc-f745e15eee43
2003-01-02 20:43:52 +00:00
edburns%acm.org
92c1171044 build_with_ant
git-svn-id: svn://10.0.0.236/trunk@131027 18797224-902f-48f8-a5cc-f745e15eee43
2002-10-02 22:23:47 +00:00
ashuk%eng.sun.com
bb42f7a19f author=ashuk
r=idk

This adds java/xpcom/Makefile to the makefiles file. Now
java/xpcom/Makefile is also to be generated using configure


git-svn-id: svn://10.0.0.236/trunk@96130 18797224-902f-48f8-a5cc-f745e15eee43
2001-05-31 20:18:48 +00:00
ashuk%eng.sun.com
051bb5a0d6 Bug=46725
author=ashuk

Files modified
java/makefiles

This patch removes the Makefile files from java/dom. The
Makefiles are now generated by configure from Makefile.in
files.


git-svn-id: svn://10.0.0.236/trunk@95760 18797224-902f-48f8-a5cc-f745e15eee43
2001-05-23 01:12:49 +00:00
edburns%acm.org
df193c38d6 Changed waterfall to pluggable-jvm
git-svn-id: svn://10.0.0.236/trunk@94504 18797224-902f-48f8-a5cc-f745e15eee43
2001-05-10 18:30:22 +00:00
edburns%acm.org
f56ea805c3 Made it so --with-java-supplement builds the waterfall makefiles.
git-svn-id: svn://10.0.0.236/trunk@94398 18797224-902f-48f8-a5cc-f745e15eee43
2001-05-09 18:53:15 +00:00
ashuk%eng.sun.com
65c14a345c author=ashuk
Bug=73085
Files modified = mozilla/java/makefiles

this fix makes it so configure creates the makefile in java/build

Index: makefiles
===================================================================
RCS file: /cvsroot/mozilla/java/makefiles,v
retrieving revision 1.3
diff -u -r1.3 makefiles
--- makefiles   2000/08/03 21:32:54     1.3
+++ makefiles   2001/05/01 18:46:47
@@ -1,6 +1,7 @@
 java/Makefile
 java/util/Makefile
 java/util/classes/Makefile
+java/build/Makefile
 java/webclient/Makefile
 java/webclient/classes_spec/Makefile
 java/webclient/src_share/Makefile


git-svn-id: svn://10.0.0.236/trunk@93553 18797224-902f-48f8-a5cc-f745e15eee43
2001-05-01 18:48:57 +00:00
edburns%acm.org
af2702d036 bug=47357
a=edburns
r=ashuk

This change creates a new directory, java/webclient/src_share, that
contains the code that will be used in both src_moz and src_ie, and any
other native browser wrapping implementations.

Here are the steps I followed to implement this change.

1. Create a new directory java/webclient/src_share

2. Move all jni_util*.* files from src_moz into src_share

3. Make it so src_share compiles into a new .lib

   src_share has no netscape dependencies.  Any functionality that
   depended on ns dependencies was kept in src_moz.  In this case, we
   have a function prototype only in src_share, with the implementation
   in src_moz.  We did this for nsHashtable.  The other trick was for
   things in WebShellInitContext that had nothing to do with Netscape.
   This case was accomodated by creating a new struct, ShareInitContext,
   that contains all WebShellInitContext members that have nothing to do
   with Netscape.  Currently this is just jobject propertiesClass.  I
   modified the WebShellInitContext struct to contain a ShareContext
   struct as its last member.  There are two new methods in jni_util.h
   that allow for the initialization and deallocation of the members of
   the ShareContext struct.

4. Make it so src_moz uses the new .lib to provide the jni_util behavior

  a. Create ns_util* files that include ../src_share/jni_util* files
  appropriately.

  The only tricky part was for things in jni_util.h that

Here's the list of files in this change.

cvs -z3 -n update (in directory D:\Projects\mozilla\java\webclient)
cvs server: Updating .
M Makefile.win // added src_share to DIRS
M src_moz/BookmarksImpl.cpp             // include ns_util instead of jni_util
M src_moz/CBrowserContainer.cpp         // include ns_util instead of jni_util
M src_moz/CBrowserContainer.h           // include ns_util instead of jni_util
M src_moz/CurrentPageImpl.cpp           // include ns_util instead of jni_util
M src_moz/HistoryImpl.cpp               // include ns_util instead of jni_util
M src_moz/Makefile.win                  // include ns_util instead of jni_util
M src_moz/NativeEventThread.cpp         // include ns_util instead of jni_util
M src_moz/NavigationImpl.cpp            // include ns_util instead of jni_util
M src_moz/RDFEnumeration.cpp            // include ns_util instead of jni_util
M src_moz/RDFTreeNode.cpp               // include ns_util instead of jni_util
M src_moz/WindowControlImpl.cpp         // include ns_util instead of jni_util
                                        // also use new util_InitShareContext
                                        // function
M src_moz/WrapperFactoryImpl.cpp        // include ns_util instead of jni_util
R src_moz/jni_util.cpp                  // moved to ../src_share
R src_moz/jni_util.h                    // moved to ../src_share
R src_moz/jni_util_export.cpp           // moved to ../src_share
R src_moz/jni_util_export.h             // moved to ../src_share
M src_moz/nsActions.cpp                 // include ns_util instead of jni_util
                                        // also use new
util_DeallocateShareContext
M src_moz/nsActions.h                   // include ns_util instead of jni_util
A src_moz/ns_util.cpp                   // include jni_util.h
A src_moz/ns_util.h                     // include jni_util.h, changes to
                                        // WebshellInitContext struct
A src_moz/ns_util_export.cpp            // provide impls for methods in
                                        // jni_util_export.h

A src_share/Makefile.win
A src_share/bal_util.cpp
A src_share/bal_util.h
A src_share/jni_util.cpp
A src_share/jni_util.h
A src_share/jni_util_export.cpp
A src_share/jni_util_export.h

*****CVS exited normally with code 0*****


git-svn-id: svn://10.0.0.236/trunk@75504 18797224-902f-48f8-a5cc-f745e15eee43
2000-08-03 21:32:54 +00:00
edburns%acm.org
a8d3fcb4e4 Finally_make_use_of_Sherry_Shen_changes
git-svn-id: svn://10.0.0.236/trunk@73598 18797224-902f-48f8-a5cc-f745e15eee43
2000-06-30 19:03:27 +00:00
sherry.shen%sun.com
b14df5fa61 Bug #28281, r=leaf, a=leaf,
Add an option for building Java-supplement and
fix the Java building problem about JDIRS.


git-svn-id: svn://10.0.0.236/trunk@62425 18797224-902f-48f8-a5cc-f745e15eee43
2000-03-09 01:14:22 +00:00