[Monodevelop-patches-list] r2718 - in trunk/MonoDevelop: . Extras Extras/VersionControl Extras/VersionControl/AddIn Extras/VersionControl/Diff Extras/VersionControl/DiffWidget Extras/VersionControl/VersionControl
John Luke <jluke@cfl.rr.com>
jluke at mono-cvs.ximian.com
Mon Aug 8 23:02:58 EDT 2005
Author: jluke
Date: 2005-08-08 23:02:58 -0400 (Mon, 08 Aug 2005)
New Revision: 2718
Modified:
trunk/MonoDevelop/ChangeLog
trunk/MonoDevelop/Extras/Makefile.am
trunk/MonoDevelop/Extras/VersionControl/AddIn/Makefile.am
trunk/MonoDevelop/Extras/VersionControl/ChangeLog
trunk/MonoDevelop/Extras/VersionControl/Diff/Makefile.am
trunk/MonoDevelop/Extras/VersionControl/DiffWidget/Makefile.am
trunk/MonoDevelop/Extras/VersionControl/VersionControl/Makefile.am
trunk/MonoDevelop/configure.in
Log:
fix the VersionControl addin to be conditional
and install right, disabled by default
Modified: trunk/MonoDevelop/ChangeLog
===================================================================
--- trunk/MonoDevelop/ChangeLog 2005-08-09 02:10:06 UTC (rev 2717)
+++ trunk/MonoDevelop/ChangeLog 2005-08-09 03:02:58 UTC (rev 2718)
@@ -1,3 +1,7 @@
+2005-08-08 John Luke <john.luke at gmail.com>
+
+ * configure.in: add conditional for version control addin
+
2005-08-05 Alp Toker <alp at atoker.com>
* monodevelop.in: Remove 'function' bash-ism to make the launcher script
Modified: trunk/MonoDevelop/Extras/Makefile.am
===================================================================
--- trunk/MonoDevelop/Extras/Makefile.am 2005-08-09 02:10:06 UTC (rev 2717)
+++ trunk/MonoDevelop/Extras/Makefile.am 2005-08-09 03:02:58 UTC (rev 2718)
@@ -1,3 +1,3 @@
-#SUBDIRS = PythonBinding MonoQuery
-SUBDIRS = MonoQuery JavaBinding BooBinding NUnit MonoDeveloperExtensions
+SUBDIRS = MonoQuery JavaBinding BooBinding NUnit MonoDeveloperExtensions VersionControl
+
Modified: trunk/MonoDevelop/Extras/VersionControl/AddIn/Makefile.am
===================================================================
--- trunk/MonoDevelop/Extras/VersionControl/AddIn/Makefile.am 2005-08-09 02:10:06 UTC (rev 2717)
+++ trunk/MonoDevelop/Extras/VersionControl/AddIn/Makefile.am 2005-08-09 03:02:58 UTC (rev 2718)
@@ -1,4 +1,4 @@
-FILES = *.cs
+FILES = Addin.cs Diffs.cs Logs.cs Statuses.cs Task.cs Update.cs
REFS = /r:$(ADDIN_BUILD)/Diff.dll \
/r:$(ADDIN_BUILD)/DiffWidget.dll \
@@ -13,11 +13,11 @@
$(GCONF_SHARP_LIBS) \
$(GTKSOURCEVIEW_SHARP_LIBS)
-RES = -resource:overlay_added.png \
- -resource:overlay_modified.png \
- -resource:overlay_conflicted.png \
- -resource:overlay_normal.png \
- -resource:overlay_locked.png
+RES = -resource:$(srcdir)/overlay_added.png,overlay_added.png \
+ -resource:$(srcdir)/overlay_modified.png,overlay_modified.png \
+ -resource:$(srcdir)/overlay_conflicted.png,overlay_conflicted.png \
+ -resource:$(srcdir)/overlay_normal.png,overlay_normal.png \
+ -resource:$(srcdir)/overlay_locked.png,overlay_locked.png
ADDIN = VersionControl.addin.xml
@@ -25,18 +25,27 @@
DLL = $(ADDIN_BUILD)/VersionControlAddIn.dll
+if ENABLE_VERSIONCONTROL
all: $(ADDIN_BUILD)/$(ADDIN) $(DLL)
+else
+all:
+endif
+if ENABLE_VERSIONCONTROL
+addindir = $(MD_ADDIN_DIR)/VersionControl
+addin_DATA = $(srcdir)/$(ADDIN) $(DLL)
+endif
+
$(ADDIN_BUILD)/$(ADDIN): $(srcdir)/$(ADDIN)
mkdir -p $(ADDIN_BUILD)
cp $(srcdir)/$(ADDIN) $(ADDIN_BUILD)/$(ADDIN)
-$(DLL): $(FILES)
+$(DLL): $(build_sources)
mkdir -p $(ADDIN_BUILD)
- $(CSC) $(CSC_FLAGS) -target:library -out:$@ $(FILES) $(REFS) $(RES)
+ $(CSC) $(CSC_FLAGS) -target:library -out:$@ $(build_sources) $(REFS) $(RES)
CLEANFILES = $(DLL) $(DLL).mdb $(ADDIN_BUILD)/$(ADDIN)
-EXTRA_DIST = $(FILES) $(ADDIN)
+EXTRA_DIST = $(FILES) $(ADDIN) overlay_added.png overlay_modified.png overlay_conflicted.png overlay_normal.png overlay_locked.png
Modified: trunk/MonoDevelop/Extras/VersionControl/ChangeLog
===================================================================
--- trunk/MonoDevelop/Extras/VersionControl/ChangeLog 2005-08-09 02:10:06 UTC (rev 2717)
+++ trunk/MonoDevelop/Extras/VersionControl/ChangeLog 2005-08-09 03:02:58 UTC (rev 2718)
@@ -1,3 +1,12 @@
+2005-08-08 John Luke <john.luke at gmail.com>
+
+ * AddIn/Makefile.am:
+ * Diff/Makefile.am:
+ * DiffWidget/Makefile.am:
+ * VersionControl/Makefile.am: fix distcheck,
+ make it conditional on ENABLE_VERSIONCONTROL,
+ and install it when enabled
+
2005-07-01 Joshua Tauberer <tauberer at for.net>
* Added MD solution files for VersionControl.
Modified: trunk/MonoDevelop/Extras/VersionControl/Diff/Makefile.am
===================================================================
--- trunk/MonoDevelop/Extras/VersionControl/Diff/Makefile.am 2005-08-09 02:10:06 UTC (rev 2717)
+++ trunk/MonoDevelop/Extras/VersionControl/Diff/Makefile.am 2005-08-09 03:02:58 UTC (rev 2718)
@@ -2,17 +2,26 @@
ADDIN_BUILD = $(top_builddir)/build/AddIns/VersionControl
ASSEMBLY = $(ADDIN_BUILD)/Diff.dll
-FILES = *.cs
+FILES = Diff.cs Merge.cs Patch.cs StructuredDiff.cs TextDiff.cs UnifiedDiff.cs
$(ADDIN_BUILD)/$(ADDIN): $(srcdir)/$(ADDIN)
-$(ASSEMBLY): $(FILES)
+$(ASSEMBLY): $(build_sources)
mkdir -p $(ADDIN_BUILD)
- $(CSC) $(CSC_FLAGS) $(FILES) -out:$@ -target:library
+ $(CSC) $(CSC_FLAGS) $(build_sources) -out:$@ -target:library
CLEANFILES = $(ASSEMBLY) $(ASSEMBLY).mdb
EXTRA_DIST = $(FILES)
+if ENABLE_VERSIONCONTROL
all: $(ASSEMBLY)
+else
+all:
+endif
+if ENABLE_VERSIONCONTROL
+addindir = $(MD_ADDIN_DIR)/VersionControl
+addin_DATA = $(ASSEMBLY)
+endif
+
include $(top_srcdir)/Makefile.include
Modified: trunk/MonoDevelop/Extras/VersionControl/DiffWidget/Makefile.am
===================================================================
--- trunk/MonoDevelop/Extras/VersionControl/DiffWidget/Makefile.am 2005-08-09 02:10:06 UTC (rev 2717)
+++ trunk/MonoDevelop/Extras/VersionControl/DiffWidget/Makefile.am 2005-08-09 03:02:58 UTC (rev 2718)
@@ -3,17 +3,26 @@
ASSEMBLY = $(ADDIN_BUILD)/DiffWidget.dll
DLLS =
-FILES = *.cs
+FILES = widget.cs
$(ADDIN_BUILD)/$(ADDIN): $(srcdir)/$(ADDIN)
-$(ASSEMBLY): $(FILES)
+$(ASSEMBLY): $(build_sources)
mkdir -p $(ADDIN_BUILD)
- $(CSC) $(CSC_FLAGS) $(FILES) -out:$@ -target:library -r:$(ADDIN_BUILD)/Diff.dll $(GTK_SHARP_LIBS)
+ $(CSC) $(CSC_FLAGS) $(build_sources) -out:$@ -target:library -r:$(ADDIN_BUILD)/Diff.dll $(GTK_SHARP_LIBS)
CLEANFILES = $(ASSEMBLY) $(ASSEMBLY).mdb
EXTRA_DIST = $(FILES)
+if ENABLE_VERSIONCONTROL
all: $(ASSEMBLY)
+else
+all:
+endif
+if ENABLE_VERSIONCONTROL
+addindir = $(MD_ADDIN_DIR)/VersionControl
+addin_DATA = $(ASSEMBLY)
+endif
+
include $(top_srcdir)/Makefile.include
Modified: trunk/MonoDevelop/Extras/VersionControl/VersionControl/Makefile.am
===================================================================
--- trunk/MonoDevelop/Extras/VersionControl/VersionControl/Makefile.am 2005-08-09 02:10:06 UTC (rev 2717)
+++ trunk/MonoDevelop/Extras/VersionControl/VersionControl/Makefile.am 2005-08-09 03:02:58 UTC (rev 2718)
@@ -3,17 +3,26 @@
ASSEMBLY = $(ADDIN_BUILD)/VersionControl.dll
DLLS =
-FILES = *.cs
+FILES = Subversion.cs VersionControl.cs
$(ADDIN_BUILD)/$(ADDIN): $(srcdir)/$(ADDIN)
-$(ASSEMBLY): $(FILES)
+$(ASSEMBLY): $(build_sources)
mkdir -p $(ADDIN_BUILD)
- $(CSC) $(CSC_FLAGS) $(FILES) -out:$@ -target:library
+ $(CSC) $(CSC_FLAGS) $(build_sources) -out:$@ -target:library
CLEANFILES = $(ASSEMBLY) $(ASSEMBLY).mdb
EXTRA_DIST = $(FILES)
+if ENABLE_VERSIONCONTROL
all: $(ASSEMBLY)
+else
+all:
+endif
+if ENABLE_VERSIONCONTROL
+addindir = $(MD_ADDIN_DIR)/VersionControl
+addin_DATA = $(ASSEMBLY)
+endif
+
include $(top_srcdir)/Makefile.include
Modified: trunk/MonoDevelop/configure.in
===================================================================
--- trunk/MonoDevelop/configure.in 2005-08-09 02:10:06 UTC (rev 2717)
+++ trunk/MonoDevelop/configure.in 2005-08-09 03:02:58 UTC (rev 2718)
@@ -148,6 +148,13 @@
fi
fi
+AC_ARG_ENABLE(versioncontrol,
+ AC_HELP_STRING([--enable-versioncontrol],
+ [enable version control support [default=no]]),
+ enable_versioncontrol=yes, enable_versioncontrol=no)
+
+AM_CONDITIONAL(ENABLE_VERSIONCONTROL, test x$enable_versioncontrol = xyes)
+
MOZILLA_HOME="`$PKG_CONFIG --variable=libdir mozilla-gtkmozembed`"
AC_SUBST(MOZILLA_HOME)
@@ -263,4 +270,5 @@
echo " * boo support: $enable_boo"
echo " * NUnit support: $enable_nunit"
echo " * Mono class library development extensions: $enable_monoextensions"
+echo " * Version control support: $enable_versioncontrol"
echo ""
More information about the Monodevelop-patches-list
mailing list