Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mono/monodevelop.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--ChangeLog13
-rw-r--r--contrib/Makefile.am2
-rw-r--r--contrib/Mono.Addins/Makefile.am76
-rw-r--r--contrib/Mono.Addins/data_files.sed2
-rw-r--r--contrib/Mono.Addins/files.sed2
-rw-r--r--contrib/Mono.Addins/references.sed2
-rw-r--r--contrib/Mono.Addins/resources.sed2
-rw-r--r--contrib/Mono.Addins/singlelinevars.sed2
-rw-r--r--contrib/extract_makefile_variable.sh2
-rw-r--r--contrib/log4net/Makefile.am2
10 files changed, 63 insertions, 42 deletions
diff --git a/ChangeLog b/ChangeLog
index f743566a2c..286a5d814e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,18 @@
2007-09-13 Michael Hutchinson <mhutchinson@novell.com>
+ * contrib/extract_makefile_variable.sh, contrib/Makefile.am,
+ contrib/Mono.Addins/Makefile.am: Refactor makefile variable
+ extraction, deploy Mono.Addins data files correctly.
+
+ * contrib/log4net/Makefile.am: Use better file listing.
+
+ * contrib/Mono.Addins/references.sed, contrib/Mono.Addins/files.sed,
+ contrib/Mono.Addins/singlelinevars.sed,
+ contrib/Mono.Addins/resources.sed,
+ contrib/Mono.Addins/data_files.sed: Removed, no longer needed.
+
+2007-09-13 Michael Hutchinson <mhutchinson@novell.com>
+
* contrib/*: Rework build code so that Mono.Addins, Mono.Cecil
and log4net libraries are included via svn:externals and built
from source.
diff --git a/contrib/Makefile.am b/contrib/Makefile.am
index 0805d8d4c7..042b17def7 100644
--- a/contrib/Makefile.am
+++ b/contrib/Makefile.am
@@ -17,4 +17,4 @@ assemblydir = $(MD_ASSEMBLY_DIR)
assembly_DATA = $(FIREBIRD)
CLEANFILES = $(FIREBIRD)
-EXTRA_DIST = $(FIREBIRD_DLL) FirebirdSql.Data.Firebird.license.txt
+EXTRA_DIST = $(FIREBIRD_DLL) $(srcdir)/FirebirdSql.Data.Firebird.license.txt $(srcdir)/extract_makefile_variable.sh
diff --git a/contrib/Mono.Addins/Makefile.am b/contrib/Mono.Addins/Makefile.am
index 8818c257bb..59b3da5499 100644
--- a/contrib/Mono.Addins/Makefile.am
+++ b/contrib/Mono.Addins/Makefile.am
@@ -1,78 +1,94 @@
-BINDIR=$(top_builddir)/build/bin
+BUILD_DIR=$(top_builddir)/build/bin
all: $(MONO_ADDINS) $(MONO_ADDINS_SETUP) $(MONO_ADDINS_GUI)
### Common settings ###
KEY_FILE = $(srcdir)/src/mono-addins.snk
MCS = mcs
+EXTRACT_VARS = $(top_srcdir)/contrib/extract_makefile_variable.sh
### Mono.Addins ###
MONO_ADDINS_DIR = $(srcdir)/src/Mono.Addins
MONO_ADDINS_DLL = Mono.Addins.dll
-MONO_ADDINS = $(BINDIR)/$(MONO_ADDINS_DLL)
+MONO_ADDINS = $(BUILD_DIR)/$(MONO_ADDINS_DLL)
MONO_ADDINS_MAKEFILE = $(srcdir)/src/Mono.Addins/Makefile.am
MONO_ADDINS_FLAGS = -keyfile:$(KEY_FILE) -langversion:ISO-1 -noconfig -codepage:utf8 -warn:4 -debug -d:DEBUG "-main:Mono.Addins.Database.SetupProcess" -target:exe
-MONO_ADDINS_FILES := $(addprefix $(MONO_ADDINS_DIR)/, $(shell sed -f $(srcdir)/singlelinevars.sed -f $(srcdir)/files.sed $(MONO_ADDINS_MAKEFILE)))
-MONO_ADDINS_RESOURCES := $(addprefix $(MONO_ADDINS_DIR)/, $(shell sed -f $(srcdir)/singlelinevars.sed -f $(srcdir)/resources.sed $(MONO_ADDINS_MAKEFILE)))
-MONO_ADDINS_REFERENCES := $(shell sed -f $(srcdir)/singlelinevars.sed -f $(srcdir)/references.sed $(MONO_ADDINS_MAKEFILE))
-MONO_ADDINS_DATA_FILES := $(addprefix $(MONO_ADDINS_DIR)/, $(shell sed -f $(srcdir)/singlelinevars.sed -f $(srcdir)/data_files.sed $(MONO_ADDINS_MAKEFILE)))
-MONO_ADDINS_DIST := $(MONO_ADDINS_FILES) $(MONO_ADDINS_RESOURCES) $(MONO_ADDINS_DATA_FILES) $(MONO_ADDINS_MAKEFILE) $(MONO_ADDINS_DIR)/$(MONO_ADDINS_DLL).config
+MONO_ADDINS_FILES := $(addprefix $(MONO_ADDINS_DIR)/, $(shell sh $(EXTRACT_VARS) $(MONO_ADDINS_MAKEFILE) "FILES"))
+MONO_ADDINS_RESOURCES := $(addprefix $(MONO_ADDINS_DIR)/, $(shell sh $(EXTRACT_VARS) $(MONO_ADDINS_MAKEFILE) "RESOURCES"))
+MONO_ADDINS_REFERENCES := $(shell sh $(EXTRACT_VARS) $(MONO_ADDINS_MAKEFILE) "REFERENCES")
+MONO_ADDINS_DATA_FILES := $(shell sh $(EXTRACT_VARS) $(MONO_ADDINS_MAKEFILE) "DATA_FILES")
+MONO_ADDINS_DIST := $(MONO_ADDINS_FILES) $(MONO_ADDINS_RESOURCES) $(addprefix $(MONO_ADDINS_DIR)/,$(MONO_ADDINS_DATA_FILES)) $(MONO_ADDINS_MAKEFILE)
-$(MONO_ADDINS): $(MONO_ADDINS_FILES) $(MONO_ADDINS_RESOURCES) $(MONO_ADDINS_DATA_FILES) $(MONO_ADDINS).config
- mkdir -p $(BINDIR)
+$(MONO_ADDINS): $(MONO_ADDINS_FILES) $(MONO_ADDINS_RESOURCES) $(MONO_ADDINS_DATA_FILES_BUILD)
+ mkdir -p $(BUILD_DIR)
$(MCS) $(MONO_ADDINS_FLAGS) -out:$@ $(MONO_ADDINS_FILES) $(MONO_ADDINS_REFERENCES) $(MONO_ADDINS_RESOURCES:%=-resource:%)
-$(MONO_ADDINS).config:
- mkdir -p $(BINDIR)
- cp $(MONO_ADDINS_DIR)/$(MONO_ADDINS_DLL).config $(MONO_ADDINS).config
+MONO_ADDINS_DATA_FILES_BUILD = $(addprefix $(BUILD_DIR)/, $(MONO_ADDINS_DATA_FILES))
+
+$(MONO_ADDINS_DATA_FILES_BUILD): $(BUILD_DIR)/% : $(addprefix $(MONO_ADDINS_DIR)/, %)
+ mkdir -p $(dir $@)
+ cp $< $@
### Mono.Addins.Setup ###
MONO_ADDINS_SETUP_DIR = $(srcdir)/src/Mono.Addins.Setup
MONO_ADDINS_SETUP_DLL = Mono.Addins.Setup.dll
-MONO_ADDINS_SETUP = $(BINDIR)/$(MONO_ADDINS_SETUP_DLL)
+MONO_ADDINS_SETUP = $(BUILD_DIR)/$(MONO_ADDINS_SETUP_DLL)
MONO_ADDINS_SETUP_MAKEFILE = $(srcdir)/src/Mono.Addins.Setup/Makefile.am
MONO_ADDINS_SETUP_FLAGS = -keyfile:$(KEY_FILE) -langversion:ISO-1 -noconfig -codepage:utf8 -warn:4 -debug -d:DEBUG -target:library
-MONO_ADDINS_SETUP_FILES := $(addprefix $(MONO_ADDINS_SETUP_DIR)/, $(shell sed -f $(srcdir)/singlelinevars.sed -f $(srcdir)/files.sed $(MONO_ADDINS_SETUP_MAKEFILE)))
-MONO_ADDINS_SETUP_RESOURCES := $(addprefix $(MONO_ADDINS_SETUP_DIR)/, $(shell sed -f $(srcdir)/singlelinevars.sed -f $(srcdir)/resources.sed $(MONO_ADDINS_SETUP_MAKEFILE)))
-MONO_ADDINS_SETUP_REFERENCES := $(shell sed -f $(srcdir)/singlelinevars.sed -f $(srcdir)/references.sed $(MONO_ADDINS_SETUP_MAKEFILE))
-MONO_ADDINS_SETUP_DATA_FILES := $(addprefix $(MONO_ADDINS_SETUP_DIR)/, $(shell sed -f $(srcdir)/singlelinevars.sed -f $(srcdir)/data_files.sed $(MONO_ADDINS_SETUP_MAKEFILE)))
-MONO_ADDINS_SETUP_DIST := $(MONO_ADDINS_SETUP_FILES) $(MONO_ADDINS_SETUP_RESOURCES) $(MONO_ADDINS_SETUP_DATA_FILES) $(MONO_ADDINS_SETUP_MAKEFILE)
+MONO_ADDINS_SETUP_FILES := $(addprefix $(MONO_ADDINS_SETUP_DIR)/, $(shell sh $(EXTRACT_VARS) $(MONO_ADDINS_SETUP_MAKEFILE) "FILES"))
+MONO_ADDINS_SETUP_RESOURCES := $(addprefix $(MONO_ADDINS_SETUP_DIR)/, $(shell sh $(EXTRACT_VARS) $(MONO_ADDINS_SETUP_MAKEFILE) "RESOURCES"))
+MONO_ADDINS_SETUP_REFERENCES := $(shell sh $(EXTRACT_VARS) $(MONO_ADDINS_SETUP_MAKEFILE) "REFERENCES")
+MONO_ADDINS_SETUP_DATA_FILES := $(shell sh $(EXTRACT_VARS) $(MONO_ADDINS_SETUP_MAKEFILE) "DATA_FILES")
+MONO_ADDINS_SETUP_DIST := $(MONO_ADDINS_SETUP_FILES) $(MONO_ADDINS_SETUP_RESOURCES) $(addprefix $(MONO_ADDINS_SETUP_DIR)/, $(MONO_ADDINS_SETUP_DATA_FILES)) $(MONO_ADDINS_SETUP_MAKEFILE)
-$(MONO_ADDINS_SETUP): $(MONO_ADDINS_SETUP_FILES) $(MONO_ADDINS_SETUP_RESOURCES) $(MONO_ADDINS_SETUP_DATA_FILES) $(MONO_ADDINS)
- mkdir -p $(BINDIR)
+$(MONO_ADDINS_SETUP): $(MONO_ADDINS_SETUP_FILES) $(MONO_ADDINS_SETUP_RESOURCES) $(MONO_ADDINS_SETUP_DATA_FILES_BUILD) $(MONO_ADDINS)
+ mkdir -p $(BUILD_DIR)
$(MCS) $(MONO_ADDINS_SETUP_FLAGS) -out:$@ $(MONO_ADDINS_SETUP_FILES) $(MONO_ADDINS_SETUP_REFERENCES) $(MONO_ADDINS_SETUP_RESOURCES:%=-resource:%) -r:$(MONO_ADDINS)
+MONO_ADDINS_SETUP_DATA_FILES_BUILD = $(addprefix $(BUILD_DIR)/, $(MONO_ADDINS_SETUP_DATA_FILES))
+
+$(MONO_ADDINS_SETUP_DATA_FILES_BUILD): $(BUILD_DIR)/% : $(addprefix $(MONO_ADDINS_SETUP_DIR)/, %)
+ mkdir -p $(dir $@)
+ cp $< $@
+
### Mono.Addins.Gui ###
MONO_ADDINS_GUI_DIR = $(srcdir)/src/Mono.Addins.Gui
MONO_ADDINS_GUI_DLL = Mono.Addins.Gui.dll
-MONO_ADDINS_GUI = $(BINDIR)/$(MONO_ADDINS_GUI_DLL)
+MONO_ADDINS_GUI = $(BUILD_DIR)/$(MONO_ADDINS_GUI_DLL)
MONO_ADDINS_GUI_MAKEFILE = $(srcdir)/src/Mono.Addins.Gui/Makefile.am
MONO_ADDINS_GUI_FLAGS = -keyfile:$(KEY_FILE) -noconfig -codepage:utf8 -warn:4 -debug -d:DEBUG -target:library
-MONO_ADDINS_GUI_FILES := $(addprefix $(MONO_ADDINS_GUI_DIR)/, $(shell sed -f $(srcdir)/singlelinevars.sed -f $(srcdir)/files.sed $(MONO_ADDINS_GUI_MAKEFILE)))
-MONO_ADDINS_GUI_RESOURCES := $(addprefix $(MONO_ADDINS_GUI_DIR)/, $(shell sed -f $(srcdir)/singlelinevars.sed -f $(srcdir)/resources.sed $(MONO_ADDINS_GUI_MAKEFILE)))
-MONO_ADDINS_GUI_REFERENCES := $(shell sed -f $(srcdir)/singlelinevars.sed -f $(srcdir)/references.sed $(MONO_ADDINS_GUI_MAKEFILE))
-MONO_ADDINS_GUI_DATA_FILES := $(addprefix $(MONO_ADDINS_GUI_DIR)/, $(shell sed -f $(srcdir)/singlelinevars.sed -f $(srcdir)/data_files.sed $(MONO_ADDINS_GUI_MAKEFILE)))
-MONO_ADDINS_GUI_DIST := $(MONO_ADDINS_GUI_FILES) $(MONO_ADDINS_GUI_RESOURCES) $(MONO_ADDINS_GUI_DATA_FILES) $(MONO_ADDINS_GUI_MAKEFILE)
+MONO_ADDINS_GUI_FILES := $(addprefix $(MONO_ADDINS_GUI_DIR)/, $(shell sh $(EXTRACT_VARS) $(MONO_ADDINS_GUI_MAKEFILE) "FILES"))
+MONO_ADDINS_GUI_RESOURCES := $(addprefix $(MONO_ADDINS_GUI_DIR)/, $(shell sh $(EXTRACT_VARS) $(MONO_ADDINS_GUI_MAKEFILE) "RESOURCES"))
+MONO_ADDINS_GUI_REFERENCES := $(shell sh $(EXTRACT_VARS) $(MONO_ADDINS_GUI_MAKEFILE) "REFERENCES")
+MONO_ADDINS_GUI_DATA_FILES := $(shell sh $(EXTRACT_VARS) $(MONO_ADDINS_GUI_MAKEFILE) "DATA_FILES")
+MONO_ADDINS_GUI_DIST := $(MONO_ADDINS_GUI_FILES) $(MONO_ADDINS_GUI_RESOURCES) $(addprefix $(MONO_ADDINS_GUI_DIR)/, $(MONO_ADDINS_GUI_DATA_FILES)) $(MONO_ADDINS_GUI_MAKEFILE)
-$(MONO_ADDINS_GUI): $(MONO_ADDINS_GUI_FILES) $(MONO_ADDINS_GUI_RESOURCES) $(MONO_ADDINS_GUI_DATA_FILES) $(MONO_ADDINS) $(MONO_ADDINS_SETUP)
- mkdir -p $(BINDIR)
+$(MONO_ADDINS_GUI): $(MONO_ADDINS_GUI_FILES) $(MONO_ADDINS_GUI_RESOURCES) $(MONO_ADDINS_GUI_DATA_FILES_BUILD) $(MONO_ADDINS) $(MONO_ADDINS_SETUP)
+ mkdir -p $(BUILD_DIR)
$(MCS) $(MONO_ADDINS_GUI_FLAGS) -out:$@ $(MONO_ADDINS_GUI_FILES) $(MONO_ADDINS_GUI_REFERENCES) $(MONO_ADDINS_GUI_RESOURCES:%=-resource:%) -r:$(MONO_ADDINS) -r:$(MONO_ADDINS_SETUP)
+MONO_ADDINS_GUI_DATA_FILES_BUILD = $(addprefix $(BUILD_DIR)/, $(MONO_ADDINS_GUI_DATA_FILES))
+
+$(MONO_ADDINS_GUI_DATA_FILES_BUILD): $(BUILD_DIR)/% : $(addprefix $(MONO_ADDINS_GUI_DIR)/, %)
+ mkdir -p $(dir $@)
+ cp $< $@
+
+
assemblydir = $(MD_ASSEMBLY_DIR)
-assembly_DATA = $(MONO_ADDINS) $(MONO_ADDINS_SETUP) $(MONO_ADDINS_GUI) $(MONO_ADDINS).config
+assembly_DATA = $(MONO_ADDINS) $(MONO_ADDINS_SETUP) $(MONO_ADDINS_GUI) $(MONO_ADDINS_DATA_FILES_BUILD) $(MONO_ADDINS_SETUP_DATA_FILES_BUILD) $(MONO_ADDINS_GUI_DATA_FILES_BUILD)
CLEANFILES = $(assembly_DATA)
-EXTRA_DIST = $(MONO_ADDINS_DIST) $(MONO_ADDINS_SETUP_DIST) $(MONO_ADDINS_GUI_DIST) $(KEY_FILE) singlelinevars.sed resources.sed files.sed data_files.sed references.sed
+EXTRA_DIST = $(MONO_ADDINS_DIST) $(MONO_ADDINS_SETUP_DIST) $(MONO_ADDINS_GUI_DIST) $(KEY_FILE)
diff --git a/contrib/Mono.Addins/data_files.sed b/contrib/Mono.Addins/data_files.sed
deleted file mode 100644
index abddeb061a..0000000000
--- a/contrib/Mono.Addins/data_files.sed
+++ /dev/null
@@ -1,2 +0,0 @@
-/^DATA_FILES/!d
-s/DATA_FILES = //
diff --git a/contrib/Mono.Addins/files.sed b/contrib/Mono.Addins/files.sed
deleted file mode 100644
index d1ab86ae6d..0000000000
--- a/contrib/Mono.Addins/files.sed
+++ /dev/null
@@ -1,2 +0,0 @@
-/^FILES/!d
-s/FILES = //
diff --git a/contrib/Mono.Addins/references.sed b/contrib/Mono.Addins/references.sed
deleted file mode 100644
index 437724d0a1..0000000000
--- a/contrib/Mono.Addins/references.sed
+++ /dev/null
@@ -1,2 +0,0 @@
-/^REFERENCES/!d
-s/REFERENCES = //
diff --git a/contrib/Mono.Addins/resources.sed b/contrib/Mono.Addins/resources.sed
deleted file mode 100644
index 8d0e2ab90d..0000000000
--- a/contrib/Mono.Addins/resources.sed
+++ /dev/null
@@ -1,2 +0,0 @@
-/^RESOURCES/!d
-s/RESOURCES = //
diff --git a/contrib/Mono.Addins/singlelinevars.sed b/contrib/Mono.Addins/singlelinevars.sed
deleted file mode 100644
index f4c4575017..0000000000
--- a/contrib/Mono.Addins/singlelinevars.sed
+++ /dev/null
@@ -1,2 +0,0 @@
-:a
-/\\$/N; s/\\\n//; ta
diff --git a/contrib/extract_makefile_variable.sh b/contrib/extract_makefile_variable.sh
new file mode 100644
index 0000000000..b2e0ca8ab2
--- /dev/null
+++ b/contrib/extract_makefile_variable.sh
@@ -0,0 +1,2 @@
+#!/bin/bash
+sed -e :a -e '/\\$/N; s/\\\n//; ta' -e "/^$2/!d" -e "s/$2 = //" $1
diff --git a/contrib/log4net/Makefile.am b/contrib/log4net/Makefile.am
index ac83616186..7d9b364ba9 100644
--- a/contrib/log4net/Makefile.am
+++ b/contrib/log4net/Makefile.am
@@ -5,7 +5,7 @@ all: $(LOG4NET)
LOG4NET_DLL=log4net.dll
LOG4NET = $(BINDIR)/$(LOG4NET_DLL)
LOG4NET_DIR=$(srcdir)/src
-LOG4NET_CSFILES=$(LOG4NET_DIR)/*.cs $(LOG4NET_DIR)/*/*.cs $(LOG4NET_DIR)/*/*/*.cs
+LOG4NET_CSFILES=$(addprefix $(srcdir)/, $(shell find $(LOG4NET_DIR) -name *.cs))
LOG4NET_DIST= $(LOG4NET_CSFILES)
LOG4NET_REFS=/r:System /r:System.Data /r:System.Web
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-22 19:11:00 +0300