Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

clean up makefiles (they need serious help), and make distcheck pass

svn path=/trunk/olive/; revision=118332
  • Loading branch information...
commit 0ac60c6890ff62eca891fa1c542b15ce5090632d 1 parent 4ddcb50
Chris Toshok authored
View
19 Makefile
@@ -1,14 +1,18 @@
thisdir := .
-SUBDIRS := build class tools data scripts nunit20
+# build is listed both at the beginning and end because the "clean"
+# recursive target ends up *creating* files in build/deps, which need
+# to be cleaned up during distcheck.
-net_3_0_SUBDIRS := build class tools data scripts nunit20
+SUBDIRS := build class tools data scripts nunit20 build
-include build/config.make
+net_3_0_SUBDIRS := build class tools data scripts nunit20 build
+
+-include build/config.make
PROFILES = net_3_0
-STD_TARGETS_OVERRIDE = all clean install uninstall run-test
+STD_TARGETS_OVERRIDE = all clean install uninstall test distclean
ifndef PROFILE
OVERRIDE_STD_TARGETS = yes
@@ -87,9 +91,9 @@ distcheck: dist-tarball
destdir=`cd InstallTest && pwd` ; \
mv $(package) Distcheck-Olive ; \
(cd Distcheck-Olive && \
- ./configure --prefix=$(prefix) \
+ ./configure --prefix=$(prefix) && \
$(MAKE) prefix=$(prefix) && $(MAKE) test && $(MAKE) install DESTDIR="$$destdir" && \
- $(MAKE) clean && $(MAKE) dist || exit 1) || exit 1 ; \
+ $(MAKE) clean && $(MAKE) dist && $(MAKE) distclean || exit 1) || exit 1 ; \
mv Distcheck-Olive $(package) ; \
tar tjf $(package)/$(package).tar.bz2 |sed -e 's,/$$,,' |sort >distdist.list ; \
rm $(package)/$(package).tar.bz2 ; \
@@ -98,7 +102,8 @@ distcheck: dist-tarball
cmp before.list after.list || exit 1 ; \
cmp before.list distdist.list || exit 1 ; \
rm -f before.list after.list distdist.list ; \
- rm -rf $(package) InstallTest
+ rm -rf $(package) InstallTest ; \
+ echo "Distcheck of $(package) successful"
monocharge:
chargedir=monocharge-`date -u +%Y%m%d` ; \
View
6 build/Makefile
@@ -8,7 +8,11 @@ all-local install-local test-local run-test-local run-test-ondotnet-local uninst
@:
clean-local:
- -rm -f $(BUILT_FILES) deps/*
+ -rm -f $(BUILT_FILES)
+
+
+distclean-local: clean-local
+ rm -f config.make deps/* deps/.stamp
common/Consts.cs: common/Consts.cs.in $(wildcard config.make)
test -n '$(MONO_VERSION)'
View
3  build/executable.make
@@ -53,6 +53,9 @@ endif
clean-local:
-rm -f $(executable_CLEAN_FILES) $(CLEAN_FILES)
+distclean-local: clean-local
+ -rm -f $(executable_DISTCLEAN_FILES) $(DISTCLEAN_FILES)
+
test-local:
@:
run-test-local:
View
27 build/library.make
@@ -70,18 +70,20 @@ library_CLEAN_FILES += TestResult*.xml
test_lib = $(LIBRARY:.dll=_test_$(PROFILE).dll)
test_sourcefile = $(LIBRARY:.dll=_test.dll.sources)
test_pdb = $(test_lib:.dll=.pdb)
+test_mdb = $(test_lib).mdb
test_response = $(depsdir)/$(test_lib).response
test_makefrag = $(depsdir)/$(test_lib).makefrag
test_flags = -r:$(the_lib) $(test_nunit_ref) $(TEST_MCS_FLAGS)
-library_CLEAN_FILES += $(LIBRARY:.dll=_test*.dll) $(LIBRARY:.dll=_test*.pdb) $(test_response) $(test_makefrag)
+library_CLEAN_FILES += $(test_lib) $(test_pdb) $(test_mdb) $(est_response) $(test_makefrag)
btest_lib = $(LIBRARY:.dll=_btest_$(PROFILE).dll)
btest_sourcefile = $(LIBRARY:.dll=_btest.dll.sources)
btest_pdb = $(btest_lib:.dll=.pdb)
+btest_mdb = $(btest_lib).mdb
btest_response = $(depsdir)/$(btest_lib).response
btest_makefrag = $(depsdir)/$(btest_lib).makefrag
btest_flags = -r:$(the_lib) $(test_nunit_ref) $(TEST_MBAS_FLAGS)
-library_CLEAN_FILES += $(LIBRARY:.dll=_btest*.dll) $(LIBRARY:.dll=_btest*.pdb) $(btest_response) $(btest_makefrag)
+library_CLEAN_FILES += $(btest_lib) $(btest_pdb) $(btest_mdb) $(btest_response) $(btest_makefrag)
ifndef HAVE_CS_TESTS
HAVE_CS_TESTS := $(wildcard $(test_sourcefile))
@@ -174,6 +176,9 @@ endif
clean-local:
-rm -f $(library_CLEAN_FILES) $(CLEAN_FILES)
+distclean-local: clean-local
+ -rm -f $(library_DISTCLEAN_FILES) $(DISTCLEAN_FILES)
+
test-local run-test-local run-test-ondotnet-local:
@:
@@ -201,17 +206,17 @@ test-local: $(test_assemblies)
run-test-local: run-test-lib
run-test-ondotnet-local: run-test-ondotnet-lib
-TEST_HARNESS_EXCLUDES = /exclude:NotWorking,ValueAdd,CAS,InetAccess
-TEST_HARNESS_EXCLUDES_ONDOTNET = /exclude:NotDotNet,CAS
+TEST_HARNESS_EXCLUDES = -exclude=NotWorking,ValueAdd,CAS,InetAccess
+TEST_HARNESS_EXCLUDES_ONDOTNET = -exclude=NotDotNet,CAS
ifdef TEST_HARNESS_VERBOSE
-TEST_HARNESS_OUTPUT = /labels
-TEST_HARNESS_OUTPUT_ONDOTNET = /labels
+TEST_HARNESS_OUTPUT = -labels
+TEST_HARNESS_OUTPUT_ONDOTNET = -labels
TEST_HARNESS_POSTPROC = :
TEST_HARNESS_POSTPROC_ONDOTNET = :
else
-TEST_HARNESS_OUTPUT = /output:TestResult-$(PROFILE).log
-TEST_HARNESS_OUTPUT_ONDOTNET = /output:TestResult-ondotnet-$(PROFILE).log
+TEST_HARNESS_OUTPUT = -output=TestResult-$(PROFILE).log
+TEST_HARNESS_OUTPUT_ONDOTNET = -output=TestResult-ondotnet-$(PROFILE).log
TEST_HARNESS_POSTPROC = (echo ''; cat TestResult-$(PROFILE).log) | sed '1,/^Tests run: /d'
TEST_HARNESS_POSTPROC_ONDOTNET = (echo ''; cat TestResult-ondotnet-$(PROFILE).log) | sed '1,/^Tests run: /d'
endif
@@ -219,12 +224,12 @@ endif
## FIXME: i18n problem in the 'sed' command below
run-test-lib: test-local
ok=:; \
- MONO_REGISTRY_PATH="$(HOME)/.mono/registry" $(TEST_RUNTIME) $(RUNTIME_FLAGS) $(TEST_HARNESS) $(TEST_HARNESS_FLAGS) $(LOCAL_TEST_HARNESS_FLAGS) $(TEST_HARNESS_EXCLUDES) $(TEST_HARNESS_OUTPUT) /xml:TestResult-$(PROFILE).xml $(test_assemblies) || ok=false; \
+ MONO_REGISTRY_PATH="$(HOME)/.mono/registry" $(TEST_RUNTIME) $(RUNTIME_FLAGS) $(TEST_HARNESS) $(TEST_HARNESS_FLAGS) $(LOCAL_TEST_HARNESS_FLAGS) $(TEST_HARNESS_EXCLUDES) $(TEST_HARNESS_OUTPUT) -xml=TestResult-$(PROFILE).xml $(test_assemblies) || ok=false; \
$(TEST_HARNESS_POSTPROC) ; $$ok
run-test-ondotnet-lib: test-local
ok=:; \
- $(TEST_HARNESS) $(TEST_HARNESS_FLAGS) $(LOCAL_TEST_HARNESS_ONDOTNET_FLAGS) $(TEST_HARNESS_EXCLUDES_ONDOTNET) $(TEST_HARNESS_OUTPUT_ONDOTNET) /xml:TestResult-ondotnet-$(PROFILE).xml $(test_assemblies) || ok=false; \
+ $(TEST_HARNESS) $(TEST_HARNESS_FLAGS) $(LOCAL_TEST_HARNESS_ONDOTNET_FLAGS) $(TEST_HARNESS_EXCLUDES_ONDOTNET) $(TEST_HARNESS_OUTPUT_ONDOTNET) -xml=TestResult-ondotnet-$(PROFILE).xml $(test_assemblies) || ok=false; \
$(TEST_HARNESS_POSTPROC_ONDOTNET) ; $$ok
endif
@@ -299,6 +304,8 @@ endif
$(the_lib): $(the_libdir)/.stamp
+library_CLEAN_FILES += $(the_libdir)/.stamp
+
$(build_lib): $(response) $(sn) $(BUILT_SOURCES) $(build_libdir:=/.stamp)
ifdef LIBRARY_USE_INTERMEDIATE_FILE
$(LIBRARY_COMPILE) $(LIBRARY_FLAGS) $(LIB_MCS_FLAGS) -target:library -out:$(LIBRARY_NAME) $(BUILT_SOURCES_cmdline) @$(response)
View
5 build/rules.make
@@ -102,7 +102,7 @@ else
all: do-all
endif
-STD_TARGETS = test run-test run-test-ondotnet clean install uninstall
+STD_TARGETS = test run-test run-test-ondotnet clean distclean install uninstall
ifdef OVERRIDE_STD_TARGETS
$(STD_TARGETS): %: %.override
@@ -167,6 +167,9 @@ dist-default:
$(MKINSTALLDIRS) $$dest && cp -p $$f $$dest || exit 1 ; \
done
+distclean-default:
+ @:
+
%/.stamp:
$(MKINSTALLDIRS) $(@D)
touch $@
View
1  class/Makefile
@@ -23,6 +23,7 @@ DIST_PROFILE_DIRS = net_3_0
dist-local: dist-default
-$(MKINSTALLDIRS) $(DIST_PROFILE_DIRS:%=$(distdir)/lib/%)
+CLEAN_FILES=$(DIST_PROFILE_DIRS:%=lib/%/.stamp)
DISTFILES = msfinal.pub winfx3.pub mono.snk mono.pub ecma.pub
View
1  data/Makefile
@@ -33,3 +33,4 @@ clean-local:
test-local:
dist-local: dist-default
+distclean-local: distclean-default
View
2  nunit20/Makefile
@@ -7,4 +7,4 @@ DISTFILES = license.rtf nunit-console.sln nunit-console.suo README
all-local install-local test-local run-test-local run-test-ondotnet-local clean-local uninstall-local:
dist-local: dist-default
-
+distclean-local: distclean-default
View
3  scripts/Makefile
@@ -51,4 +51,7 @@ install-local:
clean-local:
rm -f $(scripts_3_0)
+test-local:
+
dist-local: dist-default
+distclean-local: distclean-default
View
3  status/Makefile
@@ -7,6 +7,9 @@ API_INFO = MONO_PATH=../class/lib/$(PROFILE) $(RUNTIME) ./mono-api-info.exe
API_DIFF = MONO_PATH=../class/lib/$(PROFILE) $(RUNTIME) ./mono-api-diff.exe
OBJECTS = \
+ deploy/PresentationCore.html \
+ deploy/PresentationFramework.html \
+ deploy/WindowsBase.html \
deploy/System.Runtime.Serialization.html \
deploy/System.IdentityModel.html \
deploy/System.IdentityModel.Selectors.html \
View
3  tools/Makefile
@@ -4,12 +4,15 @@ SUBDIRS = \
sts \
svcutil
+DISTFILES=removecomments.sh
+
include ../build/rules.make
test-local run-test-local run-test-ondotnet-local all-local install-local uninstall-local:
@:
dist-local: dist-default
+distclean-local: distclean-default
clean-local:
rm -f *.exe *.dll *.pdb cormissing.xml
Please sign in to comment.
Something went wrong with that request. Please try again.