Author: zbowling
Date: 2005-03-06 20:18:00 -0500 (Sun, 06 Mar 2005)
New Revision: 41495
Added:
trunk/gtkmozembed-sharp/gtkmozembed/gecko-sharp.dll.config.in
Removed:
trunk/gtkmozembed-sharp/gtkmozembed/gecko-sharp.dll.config
Modified:
trunk/gtkmozembed-sharp/ChangeLog
trunk/gtkmozembed-sharp/configure.in
trunk/gtkmozembed-sharp/gtkmozembed/Makefile.am
trunk/gtkmozembed-sharp/gtkmozembed/WebControl.custom
trunk/gtkmozembed-sharp/gtkmozembed/gtkgecko-api.raw
Log:
2005-03-06 Zac Bowling <[EMAIL PROTECTED]>
* autogen.sh: Added new in file for autoconf blender
* gtkmozembed/gecko-sharp.dll.config.in: Added for WIN32 dll search
* configure.in: updated for building csc and without mono
* gtkmozembed/gtkgecko-api.raw: Updated for changes in the api
* gtkmozembed/Makefile.am: updated for gapi tool name differences
* gtkmozembed/WebControl.custom: added support for buggy profiles
* gtkmozembed/gecko-sharp.dll.config: Removed
Modified: trunk/gtkmozembed-sharp/ChangeLog
===================================================================
--- trunk/gtkmozembed-sharp/ChangeLog 2005-03-06 22:50:47 UTC (rev 41494)
+++ trunk/gtkmozembed-sharp/ChangeLog 2005-03-07 01:18:00 UTC (rev 41495)
@@ -1,3 +1,13 @@
+2005-03-06 Zac Bowling <[EMAIL PROTECTED]>
+
+ * autogen.sh: Added new in file for autoconf blender
+ * gtkmozembed/gecko-sharp.dll.config.in: Added for WIN32 dll search
+ * configure.in: updated for building csc and without mono
+ * gtkmozembed/gtkgecko-api.raw: Updated for changes in the api
+ * gtkmozembed/Makefile.am: updated for gapi tool name differences
+ * gtkmozembed/WebControl.custom: added support for buggy profiles
+ * gtkmozembed/gecko-sharp.dll.config: Removed
+
2005-03-06 John Luke <[EMAIL PROTECTED]>
* gtkmozembed/WebControl.custom: use generated SetProfilePath
Modified: trunk/gtkmozembed-sharp/configure.in
===================================================================
--- trunk/gtkmozembed-sharp/configure.in 2005-03-06 22:50:47 UTC (rev
41494)
+++ trunk/gtkmozembed-sharp/configure.in 2005-03-07 01:18:00 UTC (rev
41495)
@@ -6,12 +6,19 @@
API_VERSION=2.0.0.0
AC_SUBST(API_VERSION)
+MONO_REQUIRED_VERSION=1.0
+
AC_MSG_CHECKING([whether we're compiling from CVS])
if test -f "$srcdir/.cvs_version" ; then
from_cvs=yes
else
+if test -f "$srcdir/.svn" ; then
+ from_cvs=yes
+else
from_cvs=no
fi
+fi
+
AC_MSG_RESULT($from_cvs)
AC_PATH_PROG(MONO, mono)
@@ -37,11 +44,39 @@
AC_SUBST(BUILD_GTK_CFLAGS)
AC_SUBST(BUILD_GTK_LIBS)
+
+
GTK_REQUIRED_VERSION=2.0.0
MONO_REQUIRED_VERSION=0.95
-PKG_CHECK_MODULES(BASE_DEPENDENCIES, gtk+-2.0 >= $GTK_REQUIRED_VERSION
gmodule-2.0 >= $GTK_REQUIRED_VERSION mono >= $MONO_REQUIRED_VERSION)
+PKG_CHECK_MODULES(BASE_DEPENDENCIES, gtk+-2.0 >= $GTK_REQUIRED_VERSION
gmodule-2.0 >= $GTK_REQUIRED_VERSION)
+PKG_CHECK_MODULES(MONO_DEPENDENCY, mono >= $MONO_REQUIRED_VERSION,
has_mono=true, has_mono=false)
+if test "x$has_mono" = "xtrue"; then
+AC_PATH_PROG(RUNTIME, mono, no)
+AC_PATH_PROG(CSC, mcs, no)
+if test `uname -s` = "Darwin"; then
+ LIB_PREFIX=
+ LIB_SUFFIX=.dylib
+else
+ LIB_PREFIX=.so
+ LIB_SUFFIX=
+fi
+else
+AC_PATH_PROG(CSC, csc.exe, no)
+if test x$CSC = "xno"; then
+ AC_MSG_ERROR([You need to install either mono or .Net])
+else
+RUNTIME=
+LIB_PREFIX=
+LIB_SUFFIX=.dylib
+fi
+fi
+
+AC_SUBST(LIB_PREFIX)
+AC_SUBST(LIB_SUFFIX)
+
+
AC_SUBST(BASE_DEPENDENCIES_CFLAGS)
AC_SUBST(BASE_DEPENDENCIES_LIBS)
@@ -76,6 +111,7 @@
AC_OUTPUT([
Makefile
+gtkmozembed/gecko-sharp.dll.config
gtkmozembed/Makefile
gtkmozembed/AssemblyInfo.cs
sample/Makefile
Modified: trunk/gtkmozembed-sharp/gtkmozembed/Makefile.am
===================================================================
--- trunk/gtkmozembed-sharp/gtkmozembed/Makefile.am 2005-03-06 22:50:47 UTC
(rev 41494)
+++ trunk/gtkmozembed-sharp/gtkmozembed/Makefile.am 2005-03-07 01:18:00 UTC
(rev 41495)
@@ -6,6 +6,14 @@
ASSEMBLY_NAME= gecko-sharp
ASSEMBLY= $(ASSEMBLY_NAME).dll
+if WINBUILD
+CODEGEN=gapi_codegen.exe
+FIXUP=gapi-fixup.exe
+else
+CODEGEN=gapi2-codegen
+FIXUP=gapi2-fixup
+endif
+
sources = NewWindowOrphan_handler.cs \
NewWindow_delegate.cs \
NewWindow_handler.cs
@@ -25,10 +33,10 @@
$(API): $(srcdir)/$(RAW_API) $(srcdir)/$(METADATA)
cp $(srcdir)/$(RAW_API) $(API)
chmod u+w $(API)
- gapi2-fixup --api=$(API) --metadata=$(srcdir)/$(METADATA)
+ $(FIXUP) --api=$(srcdir)/$(API) --metadata=$(srcdir)/$(METADATA)
generated-stamp: $(API)
- gapi2-codegen --generate $(API) $(GTK_SHARP_CFLAGS) --outdir=generated
--customdir=$(srcdir) --assembly-name=gecko-sharp && touch generated-stamp
+ $(CODEGEN) --generate $(srcdir)/$(API) $(GTK_SHARP_CFLAGS)
--outdir=generated --customdir=$(srcdir) --assembly-name=gecko-sharp && touch
generated-stamp
gecko-sharp.snk: $(top_srcdir)/gecko-sharp.snk
cp $(top_srcdir)/gecko-sharp.snk .
Modified: trunk/gtkmozembed-sharp/gtkmozembed/WebControl.custom
===================================================================
--- trunk/gtkmozembed-sharp/gtkmozembed/WebControl.custom 2005-03-06
22:50:47 UTC (rev 41494)
+++ trunk/gtkmozembed-sharp/gtkmozembed/WebControl.custom 2005-03-07
01:18:00 UTC (rev 41495)
@@ -70,14 +70,29 @@
[DllImport("gtkembedmoz.dll")]
static extern IntPtr gtk_moz_embed_new();
-public WebControl(string aPath, string aDir) : base (IntPtr.Zero)
+private void InitProfile (string aPath, string aDir)
{
+ // Check for Windows
+ // On .NET 2.0 its "3" for Unix, Linux, and Mac
+ // On any version of Mono for anything but Windows (pre 2.0 api) its
"128"
+ if (((int) System.Environment.OSVersion.Platform) >= 4)
+ {
+ // HACK: This is to fix shared profile issues on WIN32
+ // We append a unique string to the end of the path.
+ aPath += System.Guid.NewGuid().ToString("N");
+ }
+
+ // gtk_moz_embed_set_profile_path(aPath, aDir);
SetProfilePath (aPath, aDir);
Raw = gtk_moz_embed_new ();
}
+public WebControl(string aPath, string aDir) : base (IntPtr.Zero)
+{
+ InitProfile (aPath, aDir);
+}
+
public WebControl() : base (IntPtr.Zero)
{
- SetProfilePath ("gecko-sharp", "DummyProfile");
- Raw = gtk_moz_embed_new();
+ InitProfile ("gecko-sharp", "DummyProfile");
}
Deleted: trunk/gtkmozembed-sharp/gtkmozembed/gecko-sharp.dll.config
===================================================================
--- trunk/gtkmozembed-sharp/gtkmozembed/gecko-sharp.dll.config 2005-03-06
22:50:47 UTC (rev 41494)
+++ trunk/gtkmozembed-sharp/gtkmozembed/gecko-sharp.dll.config 2005-03-07
01:18:00 UTC (rev 41495)
@@ -1,7 +0,0 @@
-<configuration>
- <dllmap dll="libglib-2.0-0.dll" target="libglib-2.0.so.0"/>
- <dllmap dll="libgobject-2.0-0.dll" target="libgobject-2.0.so.0"/>
- <dllmap dll="libatk-1.0-0.dll" target="libatk-1.0.so.0"/>
- <dllmap dll="libgtk-win32-2.0-0.dll" target="libgtk-x11-2.0.so.0"/>
- <dllmap dll="gtkembedmoz.dll" target="libgtkembedmoz.so"/>
-</configuration>
Added: trunk/gtkmozembed-sharp/gtkmozembed/gecko-sharp.dll.config.in
===================================================================
--- trunk/gtkmozembed-sharp/gtkmozembed/gecko-sharp.dll.config.in
2005-03-06 22:50:47 UTC (rev 41494)
+++ trunk/gtkmozembed-sharp/gtkmozembed/gecko-sharp.dll.config.in
2005-03-07 01:18:00 UTC (rev 41495)
@@ -0,0 +1,7 @@
+<configuration>
+ <dllmap dll="libglib-2.0-0.dll" target="[EMAIL PROTECTED]@[EMAIL
PROTECTED]@"/>
+ <dllmap dll="libgobject-2.0-0.dll" target="[EMAIL PROTECTED]@[EMAIL
PROTECTED]@"/>
+ <dllmap dll="libatk-1.0-0.dll" target="[EMAIL PROTECTED]@[EMAIL
PROTECTED]@"/>
+ <dllmap dll="libgtk-win32-2.0-0.dll" target="[EMAIL PROTECTED]@[EMAIL
PROTECTED]@"/>
+ <dllmap dll="gtkembedmoz.dll" target="[EMAIL PROTECTED]@[EMAIL PROTECTED]@"/>
+</configuration>
Modified: trunk/gtkmozembed-sharp/gtkmozembed/gtkgecko-api.raw
===================================================================
--- trunk/gtkmozembed-sharp/gtkmozembed/gtkgecko-api.raw 2005-03-06
22:50:47 UTC (rev 41494)
+++ trunk/gtkmozembed-sharp/gtkmozembed/gtkgecko-api.raw 2005-03-07
01:18:00 UTC (rev 41495)
@@ -331,8 +331,8 @@
<method name="SetProfilePath" cname="gtk_moz_embed_set_profile_path"
shared="true">
<return-type type="void"/>
<parameters>
- <parameter type="char*" name="aDir"/>
- <parameter type="char*" name="aName"/>
+ <parameter type="const-char*" name="aDir"/>
+ <parameter type="const-char*" name="aName"/>
</parameters>
</method>
<method name="StatusEnumsGetType"
cname="gtk_moz_embed_status_enums_get_type" shared="true">
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
