|
 |
2ce53fc |
From 7d46c195498b06f6fe0562f957f7309140c24a46 Mon Sep 17 00:00:00 2001
|
|
|
2ce53fc |
From: =?UTF-8?q?Robert-Andr=C3=A9=20Mauchin?= <zebob.m@gmail.com>
|
|
|
2ce53fc |
Date: Mon, 3 Feb 2020 20:51:40 +0100
|
|
|
2ce53fc |
Subject: [PATCH] Reenable mdoc.exe build
|
|
|
2ce53fc |
MIME-Version: 1.0
|
|
|
2ce53fc |
Content-Type: text/plain; charset=UTF-8
|
|
|
2ce53fc |
Content-Transfer-Encoding: 8bit
|
|
|
2ce53fc |
|
|
|
2ce53fc |
Signed-off-by: Robert-André Mauchin <zebob.m@gmail.com>
|
|
|
2ce53fc |
---
|
|
|
2ce53fc |
mcs/docs/Makefile | 4 ----
|
|
|
2ce53fc |
mcs/tools/mdoc/Makefile | 18 ++++++------------
|
|
|
2ce53fc |
2 files changed, 6 insertions(+), 16 deletions(-)
|
|
|
2ce53fc |
|
|
|
2ce53fc |
diff --git a/mcs/docs/Makefile b/mcs/docs/Makefile
|
|
|
2ce53fc |
index 92e8f2adbe5..88bddb66268 100644
|
|
|
2ce53fc |
--- a/mcs/docs/Makefile
|
|
|
2ce53fc |
+++ b/mcs/docs/Makefile
|
|
|
2ce53fc |
@@ -38,10 +38,6 @@ DISABLE_MCS_DOCS = yes
|
|
|
2ce53fc |
endif
|
|
|
2ce53fc |
endif
|
|
|
2ce53fc |
|
|
|
2ce53fc |
-ifdef MCS_MODE
|
|
|
2ce53fc |
-DISABLE_MCS_DOCS = yes
|
|
|
2ce53fc |
-endif
|
|
|
2ce53fc |
-
|
|
|
2ce53fc |
csproj-local test-local run-test-local run-test-ondotnet-local doc-update:
|
|
|
2ce53fc |
|
|
|
2ce53fc |
clean-local:
|
|
|
2ce53fc |
diff --git a/mcs/tools/mdoc/Makefile b/mcs/tools/mdoc/Makefile
|
|
|
2ce53fc |
index e3c5a321d1a..00820361636 100644
|
|
|
2ce53fc |
--- a/mcs/tools/mdoc/Makefile
|
|
|
2ce53fc |
+++ b/mcs/tools/mdoc/Makefile
|
|
|
2ce53fc |
@@ -44,12 +44,6 @@ $(PROGRAM): $(PROGRAM_DEPS)
|
|
|
2ce53fc |
|
|
|
2ce53fc |
PROGRAM_COMPILE = $(CSCOMPILE)
|
|
|
2ce53fc |
|
|
|
2ce53fc |
-ifdef MCS_MODE
|
|
|
2ce53fc |
-NO_INSTALL=1
|
|
|
2ce53fc |
-NO_BUILD=1
|
|
|
2ce53fc |
-NO_TEST=1
|
|
|
2ce53fc |
-endif
|
|
|
2ce53fc |
-
|
|
|
2ce53fc |
include ../../build/executable.make
|
|
|
2ce53fc |
|
|
|
2ce53fc |
MONO = \
|
|
|
2ce53fc |
@@ -63,6 +57,11 @@ DIFF = diff -rupZ
|
|
|
2ce53fc |
DIFF_QUIET = diff --brief -Z
|
|
|
2ce53fc |
endif
|
|
|
2ce53fc |
|
|
|
2ce53fc |
+ifdef MCS_MODE
|
|
|
2ce53fc |
+DIFF = echo "WARNING: running in mcs mode, tests are specific to roslyn and would fail. Skipping diff check."
|
|
|
2ce53fc |
+DIFF_QUIET = $(DIFF)
|
|
|
2ce53fc |
+endif
|
|
|
2ce53fc |
+
|
|
|
2ce53fc |
dist-local: dist-default dist-tests
|
|
|
2ce53fc |
|
|
|
2ce53fc |
dist-tests:
|
|
|
2ce53fc |
@@ -360,7 +359,7 @@ check-mdoc-export-msxdoc-update:
|
|
|
2ce53fc |
|
|
|
2ce53fc |
check-mdoc-export-msxdoc:
|
|
|
2ce53fc |
$(MONO) $(PROGRAM) export-msxdoc -o - Test/en.expected.importslashdoc \
|
|
|
2ce53fc |
- | $(DIFF) - Test/msxdoc-expected.importslashdoc.xml
|
|
|
2ce53fc |
+ | $(DIFF_QUIET) - Test/msxdoc-expected.importslashdoc.xml
|
|
|
2ce53fc |
|
|
|
2ce53fc |
my_abs_top_srcdir = $(shell cd . && pwd)
|
|
|
2ce53fc |
|
|
|
2ce53fc |
@@ -390,10 +389,6 @@ run-test-local: check-doc-tools
|
|
|
2ce53fc |
|
|
|
2ce53fc |
run-test-update : check-doc-tools-update
|
|
|
2ce53fc |
|
|
|
2ce53fc |
-ifdef MCS_MODE
|
|
|
2ce53fc |
-check-doc-tools:
|
|
|
2ce53fc |
- @echo "WARNING: running in mcs mode, mdoc doesn't compile with mcs. Skipping."
|
|
|
2ce53fc |
-else
|
|
|
2ce53fc |
check-doc-tools: \
|
|
|
2ce53fc |
check-monodocer-since \
|
|
|
2ce53fc |
check-monodocer-importecmadoc \
|
|
|
2ce53fc |
@@ -412,7 +407,6 @@ check-doc-tools: \
|
|
|
2ce53fc |
check-monodocer-dropns-multi-withexisting
|
|
|
2ce53fc |
|
|
|
2ce53fc |
#check-monodocer-dropns-delete
|
|
|
2ce53fc |
-endif
|
|
|
2ce53fc |
|
|
|
2ce53fc |
check-doc-tools-update: check-monodocer-since-update \
|
|
|
2ce53fc |
check-monodocer-importecmadoc-update \
|
|
|
2ce53fc |
--
|
|
|
2ce53fc |
2.24.1
|
|
|
2ce53fc |
|