NOT PART OF BUILD. Move ActiveX plugin over to GNU make

2002-08-20 19:52:26 +00:00 · 2002-08-20 19:52:26 +00:00 · 2789fb00d5
--- a/embedding/browser/activex/src/plugin/LiveConnect.cpp
+++ b/embedding/browser/activex/src/plugin/LiveConnect.cpp
@ -42,21 +42,21 @@
 #include "jni.h"
 #include "npapi.h"

-#include "_gen/java_lang_Throwable.h"
-#include "_gen/java_lang_Error.h"
-#include "_gen/java_lang_String.h"
-#include "_gen/java_lang_Boolean.h"
-#include "_gen/java_lang_Number.h"
-#include "_gen/java_lang_Integer.h"
-#include "_gen/java_lang_Long.h"
+#include "_java/java_lang_Throwable.h"
+#include "_java/java_lang_Error.h"
+#include "_java/java_lang_String.h"
+#include "_java/java_lang_Boolean.h"
+#include "_java/java_lang_Number.h"
+#include "_java/java_lang_Integer.h"
+#include "_java/java_lang_Long.h"
 // TODO:
 // These things require certain native statics to be implemented
 // so they're commented out for the time being.
-//#include "_gen/java_lang_Double.h"
-//#include "_gen/java_lang_Float.h"
-#include "_gen/java_lang_Character.h"
-#include "_gen/netscape_plugin_Plugin.h"
-#include "_gen/MozAxPlugin.h"
+//#include "_java/java_lang_Double.h"
+//#include "_java/java_lang_Float.h"
+#include "_java/java_lang_Character.h"
+#include "_java/netscape_plugin_Plugin.h"
+#include "_java/MozAxPlugin.h"

 #include "LegacyPlugin.h"

--- a/embedding/browser/activex/src/plugin/Makefile.in
+++ b/embedding/browser/activex/src/plugin/Makefile.in
@ -0,0 +1,332 @@
+#!nmake
+#
+# The contents of this file are subject to the Netscape Public
+# License Version 1.1 (the "License"); you may not use this file
+# except in compliance with the License. You may obtain a copy of
+# the License at http://www.mozilla.org/NPL/
+#
+# Software distributed under the License is distributed on an "AS
+# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+# implied. See the License for the specific language governing
+# rights and limitations under the License.
+#
+# The Original Code is mozilla.org code.
+#
+# The Initial Developer of the Original Code is Netscape
+# Communications Corporation.  Portions created by Netscape are
+# Copyright (C) 1998 Netscape Communications Corporation. All
+# Rights Reserved.
+#
+# Contributor(s): 
+
+###############################################################################
+# CUSTOMISE SETTINGS IN THIS SECTION AS APPROPRIATE FOR YOUR BUILD SYSTEM!
+
+DEPTH           = ../../../../..
+topsrcdir       = @top_srcdir@
+srcdir          = @srcdir@
+VPATH           = @srcdir@
+
+include $(DEPTH)/config/autoconf.mk
+
+MODULE          = npmozax
+LIBRARY_NAME    = npmozax
+RESFILE         = MozActiveX.res
+DEFFILE         = npmozax.def
+REQUIRES = \
+    xpcom \
+    java \
+    plugin \
+    string \
+    $(NULL)
+
+FORCE_SHARED_LIB = 1
+NO_DIST_INSTALL	= 1
+NO_INSTALL = 1
+
+# Path to the Mozilla ActiveX control (some files are copied from there)
+MOZCTLSRC=../control
+
+############
+# LiveConnect settings
+
+MOZ_ACTIVEX_PLUGIN_LIVECONNECT = 1
+
+# Settings that specify where the PluginSDK, Java compiler (javac or oldjavac),
+# Java header file generator (javah) and classes live.
+#
+# You need the Netscape PluginSDK:
+#
+#   http://home.netscape.com/comprod/development_partners/plugin_api/index.html
+#
+# You also need a JDK with the old java compiler. Anything from 1.3
+# downwards should do. See here for various JDK releases:
+#
+#   http://java.sun.com/products/archive/index.html
+#
+# You should use the javah found in the plugin SDK because this generates
+# the JRI stubs.
+
+ifdef MOZ_ACTIVEX_PLUGIN_LIVECONNECT
+PLUGINSDK = c:/m/PluginSDK
+SDK_JAVADIR = c:/jdk1.02
+SDK_JAVAH = $(PLUGINSDK)/bin/win32/javah
+SDK_JAVAC = $(SDK_JAVADIR)/bin/javac
+SDK_CLASSES = $(PLUGINSDK)/classes/java_30.zip
+SDK_CLASSPATH = "$(subst /,\,$(SDK_CLASSES));."
+endif
+
+
+############
+# XPConnect settings
+
+# MOZ_ACTIVEX_PLUGIN_XPCONNECT = 1
+
+# XPConnect support in (Netscape 6.1+/Mozilla)
+
+###############################################################################
+
+ifdef MOZ_ACTIVEX_PLUGIN_XPCONNECT
+XPIDLSRCS = \
+    ./nsIMozAxPlugin.idl          \
+    $(NULL)
+endif
+
+CPPSRCS = \
+    StdAfx.cpp             \
+    ControlSite.cpp        \
+    ControlSiteIPFrame.cpp \
+    ItemContainer.cpp      \
+    PropertyBag.cpp        \
+    ActiveScriptSite.cpp   \
+    LegacyPlugin.cpp       \
+    MozActiveX.cpp         \
+    npwin.cpp
+
+ifdef MOZ_ACTIVEX_PLUGIN_XPCONNECT
+CPPSRCS += \
+    XPConnect.cpp
+endif
+
+ifdef MOZ_ACTIVEX_PLUGIN_LIVECONNECT
+CPPSRCS += LiveConnect.cpp
+CSRCS += javastubs.c
+endif
+
+DEFINES += -DWIN32_LEAN_AND_MEAN
+
+LOCAL_INCLUDES = -I$(MOZCTLSRC)
+
+ifdef MOZ_ACTIVEX_PLUGIN_LIVECONNECT
+LOCAL_INCLUDES += -I.\_java
+endif
+
+ifdef MOZ_ACTIVEX_PLUGIN_XPCONNECT
+LOCAL_INCLUDES += -I.\_xpidlgen
+endif
+
+OS_LIBS += \
+    comdlg32.lib                   \
+    ole32.lib                      \
+    oleaut32.lib                   \
+    uuid.lib                       \
+    shell32.lib                    \
+    $(NULL)
+
+ifdef MOZ_ACTIVEX_PLUGIN_LIVECONNECT
+DEFINES += -DMOZ_ACTIVEX_PLUGIN_LIVECONNECT
+endif
+
+ifdef MOZ_ACTIVEX_PLUGIN_XPCONNECT
+DEFINES += -DMOZ_ACTIVEX_PLUGIN_XPCONNECT
+endif
+
+include $(topsrcdir)/config/rules.mk
+
+CXXFLAGS += -GX
+
+
+install-plugin: $(SHARED_LIBRARY)
+ifdef SHARED_LIBRARY
+	$(INSTALL) $(SHARED_LIBRARY) $(DIST)/bin/plugins
+endif
+
+install-class: 
+	$(INSTALL) MozAxPlugin.class $(DIST)/bin/plugins
+
+install-typelib:
+	$(INSTALL) _xpidlgen/nsIMozAxPlugin.xpt $(DIST)/bin/components
+
+libs:: install-plugin
+
+ifdef MOZ_ACTIVEX_PLUGIN_LIVECONNECT
+libs:: install-class
+endif
+
+ifdef MOZ_ACTIVEX_PLUGIN_XPCONNECT
+libs:: install-typelib
+endif
+
+clean::
+	-rm $(DEFFILE)
+
+$(DEFFILE):
+	-rm $@
+	@echo "; npmozax.def : Declares the module parameters." >> $@
+	@echo "; This file was autogenerated by mkctldef.bat!" >> $@
+	@echo "" >> $@
+	@echo "LIBRARY      "npmozax.DLL"" >> $@
+	@echo "EXPORTS" >> $@
+	@echo "; Plugin exports" >> $@
+	@echo "NP_GetEntryPoints   @1" >> $@
+	@echo "NP_Initialize       @2" >> $@
+	@echo "NP_Shutdown         @3" >> $@
+	@echo "; NSGetFactory         @10" >> $@
+
+ifdef MOZ_ACTIVEX_PLUGIN_LIVECONNECT
+./MozAxPlugin.class: ./MozAxPlugin.java
+	$(SDK_JAVAC) -classpath $(SDK_CLASSPATH) MozAxPlugin.java
+
+./_java/MozAxPlugin.h \
+./_java/MozAxPlugin.c: ./MozAxPlugin.class
+	$(SDK_JAVAH) -classpath $(SDK_CLASSPATH) -jri -d _java MozAxPlugin
+	$(SDK_JAVAH) -classpath $(SDK_CLASSPATH) -jri -stubs -d _java MozAxPlugin
+
+./_java/java_lang_Object.h \
+./_java/java_lang_Object.c : $(SDK_CLASSES)
+	$(SDK_JAVAH) -classpath $(SDK_CLASSPATH) -jri -d _java java.lang.Object
+	$(SDK_JAVAH) -classpath $(SDK_CLASSPATH) -jri -stubs -d _java java.lang.Object
+
+./_java/java_lang_Error.h \
+./_java/java_lang_Error.c : $(SDK_CLASSES)
+	$(SDK_JAVAH) -classpath $(SDK_CLASSPATH) -jri -d _java java.lang.Error
+	$(SDK_JAVAH) -classpath $(SDK_CLASSPATH) -jri -stubs -d _java java.lang.Error
+
+./_java/java_lang_Throwable.h \
+./_java/java_lang_Throwable.c : $(SDK_CLASSES)
+	$(SDK_JAVAH) -classpath $(SDK_CLASSPATH) -jri -d _java java.lang.Throwable
+	$(SDK_JAVAH) -classpath $(SDK_CLASSPATH) -jri -stubs -d _java java.lang.Throwable
+
+./_java/java_lang_String.h \
+./_java/java_lang_String.c : $(SDK_CLASSES)
+	$(SDK_JAVAH) -classpath $(SDK_CLASSPATH) -jri -d _java java.lang.String
+	$(SDK_JAVAH) -classpath $(SDK_CLASSPATH) -jri -stubs -d _java java.lang.String
+
+./_java/java_lang_Boolean.h \
+./_java/java_lang_Boolean.c : $(SDK_CLASSES)
+	$(SDK_JAVAH) -classpath $(SDK_CLASSPATH) -jri -d _java java.lang.Boolean
+	$(SDK_JAVAH) -classpath $(SDK_CLASSPATH) -jri -stubs -d _java java.lang.Boolean
+
+./_java/java_lang_Number.h \
+./_java/java_lang_Number.c : $(SDK_CLASSES)
+	$(SDK_JAVAH) -classpath $(SDK_CLASSPATH) -jri -d _java java.lang.Number
+	$(SDK_JAVAH) -classpath $(SDK_CLASSPATH) -jri -stubs -d _java java.lang.Number
+
+./_java/java_lang_Integer.h \
+./_java/java_lang_Integer.c : $(SDK_CLASSES)
+	$(SDK_JAVAH) -classpath $(SDK_CLASSPATH) -jri -d _java java.lang.Integer
+	$(SDK_JAVAH) -classpath $(SDK_CLASSPATH) -jri -stubs -d _java java.lang.Integer
+
+./_java/java_lang_Short.h \
+./_java/java_lang_Short.c : $(SDK_CLASSES)
+	$(SDK_JAVAH) -classpath $(SDK_CLASSPATH) -jri -d _java java.lang.Short
+	$(SDK_JAVAH) -classpath $(SDK_CLASSPATH) -jri -stubs -d _java java.lang.Short
+
+./_java/java_lang_Long.h \
+./_java/java_lang_Long.c : $(SDK_CLASSES)
+	$(SDK_JAVAH) -classpath $(SDK_CLASSPATH) -jri -d _java java.lang.Long
+	$(SDK_JAVAH) -classpath $(SDK_CLASSPATH) -jri -stubs -d _java java.lang.Long
+
+./_java/java_lang_Double.h \
+./_java/java_lang_Double.c : $(SDK_CLASSES)
+	$(SDK_JAVAH) -classpath $(SDK_CLASSPATH) -jri -d _java java.lang.Double
+	$(SDK_JAVAH) -classpath $(SDK_CLASSPATH) -jri -stubs -d _java java.lang.Double
+
+./_java/java_lang_Float.h \
+./_java/java_lang_Float.c : $(SDK_CLASSES)
+	$(SDK_JAVAH) -classpath $(SDK_CLASSPATH) -jri -d _java java.lang.Float
+	$(SDK_JAVAH) -classpath $(SDK_CLASSPATH) -jri -stubs -d _java java.lang.Float
+
+./_java/java_lang_Byte.h \
+./_java/java_lang_Byte.c : $(SDK_CLASSES)
+	$(SDK_JAVAH) -classpath $(SDK_CLASSPATH) -jri -d _java java.lang.Byte
+	$(SDK_JAVAH) -classpath $(SDK_CLASSPATH) -jri -stubs -d _java java.lang.Byte
+
+./_java/java_lang_Character.h \
+./_java/java_lang_Character.c : $(SDK_CLASSES)
+	$(SDK_JAVAH) -classpath $(SDK_CLASSPATH) -jri -d _java java.lang.Character
+	$(SDK_JAVAH) -classpath $(SDK_CLASSPATH) -jri -stubs -d _java java.lang.Character
+
+./_java/netscape_plugin_Plugin.h \
+./_java/netscape_plugin_Plugin.c : $(SDK_CLASSES)
+	$(SDK_JAVAH) -classpath $(SDK_CLASSPATH) -jri -d _java netscape.plugin.Plugin
+	$(SDK_JAVAH) -classpath $(SDK_CLASSPATH) -jri -stubs -d _java netscape.plugin.Plugin
+
+javastubs.c : \
+    ./MozAxPlugin.class             \
+    ./_java/MozAxPlugin.c \
+    ./_java/netscape_plugin_Plugin.c \
+    ./_java/java_lang_Object.c     \
+    ./_java/java_lang_Throwable.c  \
+    ./_java/java_lang_Error.c      \
+    ./_java/java_lang_String.c     \
+    ./_java/java_lang_Boolean.c    \
+    ./_java/java_lang_Number.c     \
+    ./_java/java_lang_Integer.c    \
+    ./_java/java_lang_Long.c       \
+    ./_java/java_lang_Double.c     \
+    ./_java/java_lang_Float.c      \
+    ./_java/java_lang_Character.c  \
+    $(NULL)
+
+LiveConnect.cpp: StdAfx.h \
+    ./MozAxPlugin.class             \
+    ./_java/MozAxPlugin.h \
+    ./_java/netscape_plugin_Plugin.h \
+    ./_java/java_lang_Object.h       \
+    ./_java/java_lang_Throwable.h    \
+    ./_java/java_lang_Error.h        \
+    ./_java/java_lang_String.h       \
+    ./_java/java_lang_Boolean.h      \
+    ./_java/java_lang_Number.h       \
+    ./_java/java_lang_Integer.h      \
+    ./_java/java_lang_Long.h         \
+    ./_java/java_lang_Double.h       \
+    ./_java/java_lang_Float.h        \
+    ./_java/java_lang_Character.h    \
+    $(NULL)
+
+endif
+
+ActiveScriptSite.cpp: $(MOZCTLSRC)/ActiveScriptSite.cpp
+	-cp $(MOZCTLSRC)/ActiveScriptSite.cpp .
+
+MozActiveX.res: MozActiveX.rc resource.h
+
+MozActiveX.cpp: StdAfx.h
+
+ifdef MOZ_ACTIVEX_PLUGIN_XPCONNECT
+XPConnect.cpp: StdAfx.h \
+	./_xpidlgen/nsIMozAxPlugin.h    \
+	$(NULL)
+endif
+
+LegacyPlugin.cpp: StdAfx.h ./LegacyPlugin.h
+
+ifdef MOZ_ACTIVEX_PLUGIN_XPCONNECT
+LegacyPlugin.cpp : ./_xpidlgen/nsIMozAxPlugin.h
+endif
+
+StdAfx.cpp : StdAfx.h
+
+PropertyBag.cpp : $(MOZCTLSRC)/PropertyBag.cpp
+	-cp $(MOZCTLSRC)/PropertyBag.cpp .
+
+ControlSite.cpp : $(MOZCTLSRC)/ControlSite.cpp
+	-cp $(MOZCTLSRC)/ControlSite.cpp .
+
+ControlSiteIPFrame.cpp : $(MOZCTLSRC)/ControlSiteIPFrame.cpp
+	-cp $(MOZCTLSRC)/ControlSiteIPFrame.cpp .
+
+ItemContainer.cpp : $(MOZCTLSRC)/ItemContainer.cpp
+	-cp $(MOZCTLSRC)/ItemContainer.cpp .
--- a/embedding/browser/activex/src/plugin/XPConnect.cpp
+++ b/embedding/browser/activex/src/plugin/XPConnect.cpp
@ -39,6 +39,9 @@
 * ***** END LICENSE BLOCK ***** */
 #include "stdafx.h"

+#include "nsCOMPtr.h"
+#include "nsComponentManagerUtils.h"
+
 #include "nsIMozAxPlugin.h"
 #include "nsIClassInfo.h"
 #include "nsIVariant.h"
@ -312,6 +315,9 @@ nsScriptablePeer::ConvertVariants(VARIANT *aIn, nsIVariant **aOut)
        return NS_ERROR_INVALID_ARG;
    }

+    nsresult rv;
+    nsCOMPtr<nsIWritableVariant> v = do_CreateInstance("@mozilla.org/variant;1", &rv); 
+
    return E_NOTIMPL;
 } 

@ -595,5 +601,7 @@ NS_IMETHODIMP nsScriptablePeer::SetProperty(const char *propertyName, nsIVariant
    { 
        return NPERR_GENERIC_ERROR;
    }
+
    return NS_OK;
 }
+
--- a/embedding/browser/activex/src/plugin/javastubs.c
+++ b/embedding/browser/activex/src/plugin/javastubs.c
@ -3,15 +3,15 @@
 */

 #define IMPLEMENT_MozAxPlugin
-#include "_stubs/MozAxPlugin.c"
-#include "_stubs/netscape_plugin_Plugin.c"
-#include "_stubs/java_lang_Throwable.c"
-#include "_stubs/java_lang_Error.c"
-#include "_stubs/java_lang_String.c"
-#include "_stubs/java_lang_Boolean.c"
-#include "_stubs/java_lang_Number.c"
-#include "_stubs/java_lang_Integer.c"
-#include "_stubs/java_lang_Long.c"
-//#include "_stubs/java_lang_Double.c"
-//#include "_stubs/java_lang_Float.c"
-#include "_stubs/java_lang_Character.c"
+#include "_java/MozAxPlugin.c"
+#include "_java/netscape_plugin_Plugin.c"
+#include "_java/java_lang_Throwable.c"
+#include "_java/java_lang_Error.c"
+#include "_java/java_lang_String.c"
+#include "_java/java_lang_Boolean.c"
+#include "_java/java_lang_Number.c"
+#include "_java/java_lang_Integer.c"
+#include "_java/java_lang_Long.c"
+//#include "_java/java_lang_Double.c"
+//#include "_java/java_lang_Float.c"
+#include "_java/java_lang_Character.c"
--- a/embedding/browser/activex/src/plugin/makefile.win
+++ b/embedding/browser/activex/src/plugin/makefile.win