diff options
| -rw-r--r-- | extras/ValaBinding/ChangeLog | 6 | ||||
| -rw-r--r-- | extras/ValaBinding/Makefile.am | 84 | ||||
| -rw-r--r-- | extras/ValaBinding/ValaBinding.mdp | 2 | ||||
| -rw-r--r-- | extras/ValaBinding/configure.in | 31 |
4 files changed, 49 insertions, 74 deletions
diff --git a/extras/ValaBinding/ChangeLog b/extras/ValaBinding/ChangeLog index 00ca7202b4..a36e6c62ed 100644 --- a/extras/ValaBinding/ChangeLog +++ b/extras/ValaBinding/ChangeLog @@ -1,5 +1,11 @@ 2008-06-12 Lluis Sanchez Gual <lluis@novell.com> + * configure.in, Makefile.am: Fix makefile so that it does not directly + depend on MD core and it can always be built standalone. + * ValaBinding.mdp: Enable makefile synchronization. + +2008-06-12 Lluis Sanchez Gual <lluis@novell.com> + * ValaBinding.mdp: Fix gtk-sharp dependency versions. 2008-06-09 Levi Bard <taktaktaktaktaktaktaktaktaktak@gmail.com> diff --git a/extras/ValaBinding/Makefile.am b/extras/ValaBinding/Makefile.am index 8274bf30af..fac6c9dc3b 100644 --- a/extras/ValaBinding/Makefile.am +++ b/extras/ValaBinding/Makefile.am @@ -1,18 +1,12 @@ -ADDIN_BUILD = @MD_BUILDDIR@/AddIns/BackendBindings +ADDIN_BUILD = $(top_builddir)/build ASSEMBLY = $(ADDIN_BUILD)/MonoDevelop.ValaBinding.dll REFS = \ -pkg:glib-sharp-2.0 \ -pkg:gtk-sharp-2.0 \ -pkg:mono-addins \ - -r:@MD_ADDIN_DIR@/MonoDevelop.Deployment/MonoDevelop.Deployment.dll \ - -r:@MD_ADDIN_DIR@/MonoDevelop.Deployment/MonoDevelop.Deployment.Linux.dll \ - -r:@MD_ASSEMBLY_DIR@/MonoDevelop.Components.dll \ - -r:@MD_ASSEMBLY_DIR@/MonoDevelop.Core.dll \ - -r:@MD_ASSEMBLY_DIR@/MonoDevelop.Core.Gui.dll \ - -r:@MD_ASSEMBLY_DIR@/MonoDevelop.Ide.dll \ - -r:@MD_ASSEMBLY_DIR@/MonoDevelop.Projects.dll \ - -r:@MD_ASSEMBLY_DIR@/MonoDevelop.Projects.Gui.dll \ + -pkg:monodevelop \ + -pkg:monodevelop-core-addins \ -r:Mono.Posix \ -r:System \ -r:System.Xml @@ -25,44 +19,19 @@ FILES = \ gtk-gui/MonoDevelop.ValaBinding.AddLibraryDialog.cs \ gtk-gui/MonoDevelop.ValaBinding.AddPathDialog.cs \ gtk-gui/MonoDevelop.ValaBinding.CodeGenerationPanel.cs \ + gtk-gui/MonoDevelop.ValaBinding.EditPackagesDialog.cs \ gtk-gui/MonoDevelop.ValaBinding.GeneralOptionsPanel.cs \ gtk-gui/MonoDevelop.ValaBinding.OutputOptionsPanel.cs \ - gtk-gui/MonoDevelop.ValaBinding.EditPackagesDialog.cs \ gtk-gui/MonoDevelop.ValaBinding.PackageDetails.cs \ Gui/AddLibraryDialog.cs \ Gui/AddPathDialog.cs \ Gui/CodeGenerationPanel.cs \ Gui/DataProvider.cs \ + Gui/EditPackagesDialog.cs \ Gui/GeneralOptionsPanel.cs \ Gui/OutputOptionsPanel.cs \ - Gui/ValaTextEditorExtension.cs \ - Gui/EditPackagesDialog.cs \ Gui/PackageDetails.cs \ - Project/ProjectPackage.cs \ - Project/ProjectPackageCollection.cs \ - Project/ProjectPackageEventArgs.cs \ - Project/ValaCompilationParameters.cs \ - Project/ValaProject.cs \ - Project/ValaProjectBinding.cs \ - Project/ValaProjectConfiguration.cs \ - Project/ValaProjectServiceExtension.cs \ - Parser/Class.cs \ - Parser/Enumeration.cs \ - Parser/Enumerator.cs \ - Parser/Function.cs \ - Parser/LanguageItem.cs \ - Parser/Local.cs \ - Parser/Macro.cs \ - Parser/Member.cs \ - Parser/Namespace.cs \ - Parser/ProjectInformation.cs \ - Parser/ProjectInformationManager.cs \ - Parser/Structure.cs \ - Parser/Tag.cs \ - Parser/TagDatabaseManager.cs \ - Parser/Typedef.cs \ - Parser/Union.cs \ - Parser/Variable.cs \ + Gui/ValaTextEditorExtension.cs \ Navigation/ClassNodeBuilder.cs \ Navigation/ClassPadEventArgs.cs \ Navigation/EnumerationNodeBuilder.cs \ @@ -80,11 +49,36 @@ FILES = \ Navigation/TypedefNodeBuilder.cs \ Navigation/UnionNodeBuilder.cs \ Navigation/VariableNodeBuilder.cs \ - ProjectPad/ProjectReferencesExtension.cs \ - ProjectPad/ProjectResourcesExtension.cs \ + Parser/Class.cs \ + Parser/Enumeration.cs \ + Parser/Enumerator.cs \ + Parser/Function.cs \ + Parser/LanguageItem.cs \ + Parser/Local.cs \ + Parser/Macro.cs \ + Parser/Member.cs \ + Parser/Namespace.cs \ + Parser/ProjectInformation.cs \ + Parser/ProjectInformationManager.cs \ + Parser/Structure.cs \ + Parser/Tag.cs \ + Parser/TagDatabaseManager.cs \ + Parser/Typedef.cs \ + Parser/Union.cs \ + Parser/Variable.cs \ + Project/ProjectPackage.cs \ + Project/ProjectPackageCollection.cs \ + Project/ProjectPackageEventArgs.cs \ + Project/ValaCompilationParameters.cs \ + Project/ValaProject.cs \ + Project/ValaProjectBinding.cs \ + Project/ValaProjectConfiguration.cs \ + Project/ValaProjectServiceExtension.cs \ + ProjectPad/ProjectNodeExtension.cs \ ProjectPad/ProjectPackageNodeBuilder.cs \ ProjectPad/ProjectPackagesFolderNodeBuilder.cs \ - ProjectPad/ProjectNodeExtension.cs \ + ProjectPad/ProjectReferencesExtension.cs \ + ProjectPad/ProjectResourcesExtension.cs \ ValaLanguageBinding.cs RES = \ @@ -105,21 +99,17 @@ RES = \ templates/SharedLibraryValaProject.xpt.xml \ ValaBinding.addin.xml -if ENABLE_VALA all: $(ASSEMBLY) -else -all: -endif + +LOCAL_PKGCONFIG=PKG_CONFIG_PATH=../../local-config:$$PKG_CONFIG_PATH $(ASSEMBLY): $(build_sources) $(build_resources) mkdir -p $(ADDIN_BUILD) - $(CSC) $(CSC_FLAGS) -debug -out:$@ -target:library $(REFS) \ + $(LOCAL_PKGCONFIG) $(CSC) $(CSC_FLAGS) -debug -out:$@ -target:library $(REFS) \ $(build_resources:%=/resource:%) $(build_sources) -if ENABLE_VALA valabindinglibdir = $(prefix)/lib/monodevelop/AddIns/BackendBindings valabindinglib_DATA = $(ASSEMBLY) -endif CLEANFILES = $(ASSEMBLY) $(ASSEMBLY).mdb diff --git a/extras/ValaBinding/ValaBinding.mdp b/extras/ValaBinding/ValaBinding.mdp index 5b5a077df4..71a483fdab 100644 --- a/extras/ValaBinding/ValaBinding.mdp +++ b/extras/ValaBinding/ValaBinding.mdp @@ -123,7 +123,7 @@ <Widget>ValaBinding.GeneralOptionsPanel</Widget> </ExportedWidgets> </GtkDesignInfo> - <MonoDevelop.Autotools.MakefileInfo RelativeMakefileName="Makefile.am" IsAutotoolsProject="True" RelativeConfigureInPath="../../../"> + <MonoDevelop.Autotools.MakefileInfo IntegrationEnabled="True" RelativeMakefileName="Makefile.am" SyncReferences="True" IsAutotoolsProject="True" RelativeConfigureInPath="."> <BuildFilesVar Sync="True" Name="FILES" /> <DeployFilesVar /> <ResourcesVar Sync="True" Name="RES" /> diff --git a/extras/ValaBinding/configure.in b/extras/ValaBinding/configure.in index f4a6a01089..cf89db3421 100644 --- a/extras/ValaBinding/configure.in +++ b/extras/ValaBinding/configure.in @@ -50,6 +50,7 @@ fi dnl hard dependencies MONOADDINS_REQUIRED_VERSION=0.3 GTKSHARP_REQUIRED_VERSION=2.8.0 +MONODEVELOP_REQUIRED_VERSION=1.9 PKG_CHECK_MODULES(MONO_ADDINS, mono-addins >= $MONOADDINS_REQUIRED_VERSION) AC_SUBST(MONO_ADDINS_LIBS) @@ -63,6 +64,10 @@ PKG_CHECK_MODULES(GTK_SHARP, gtk-sharp-2.0 >= $GTKSHARP_REQUIRED_VERSION) AC_SUBST(GTK_SHARP_LIBS) PKG_CHECK_MODULES(GLADE_SHARP, glade-sharp-2.0 >= $GTKSHARP_REQUIRED_VERSION) AC_SUBST(GLADE_SHARP_LIBS) +PKG_CHECK_MODULES(MONODEVELOP, monodevelop >= $MONODEVELOP_REQUIRED_VERSION) +AC_SUBST(MONODEVELOP_LIBS) +PKG_CHECK_MODULES(MONODEVELOP_CORE_ADDINS, monodevelop-core-addins >= $MONODEVELOP_REQUIRED_VERSION) +AC_SUBST(MONODEVELOP_CORE_ADDINS_LIBS) dnl soft dependencies PKG_CHECK_MODULES(GNOME_SHARP, gnome-sharp-2.0 >= $GTKSHARP_REQUIRED_VERSION, [gnome_sharp=yes], [gnome_sharp=no]) @@ -80,9 +85,6 @@ AC_SUBST(gtksharp_prefix) platform_bindings="" -enable_vala=yes -AM_CONDITIONAL(ENABLE_VALA, [test x$enable_vala = xyes]) - CSC_FLAGS="-debug -codepage:utf8" AC_SUBST(LIB_SUFFIX) @@ -90,29 +92,6 @@ AC_SUBST(LIB_PREFIX) AC_SUBST(ASSEMBLY_VERSION) AC_SUBST(CSC_FLAGS) - -MD_DIR='$(prefix)/lib/monodevelop' - -# Standalone build -AC_ARG_ENABLE(standalone, AC_HELP_STRING([--enable-standalone], [enable standalone build [default=no]]), enable_standalone=${enableval}, enable_standalone=no) - -if test x$enable_standalone = xyes; then - MD_BUILDDIR=./build - MD_ASSEMBLY_DIR="$prefix/lib/monodevelop/bin" - MD_ADDIN_DIR="$prefix/lib/monodevelop/AddIns" - echo "Building standalone" -else - MD_BUILDDIR=../../main/build - MD_ASSEMBLY_DIR="$MD_BUILDDIR/bin" - MD_ADDIN_DIR="$MD_BUILDDIR/AddIns" - echo "Building as part of MonoDevelop" -fi - -AC_SUBST(MD_BUILDDIR) -AC_SUBST(MD_ASSEMBLY_DIR) -AC_SUBST(MD_ADDIN_DIR) -AC_SUBST(MD_DIR) - AC_OUTPUT([ Makefile ]) |