Skip to content

Commit

Permalink
Add csc-dim as a prototype if default interface implementation
Browse files Browse the repository at this point in the history
  • Loading branch information
marek-safar committed Mar 20, 2018
1 parent 5b66de0 commit 535bfc5
Show file tree
Hide file tree
Showing 4 changed files with 16 additions and 2 deletions.
8 changes: 7 additions & 1 deletion mcs/packages/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -28,21 +28,27 @@ ROSLYN_FILES_TO_COPY_FOR_MSBUILD = \
$(ROSLYN_CSC_DIR)/Microsoft.CSharp.Core.targets \
$(ROSLYN_CSC_DIR)/Microsoft.VisualBasic.Core.targets

ROSLYN_DIM_FILES = $(topdir)/../external/roslyn-binaries/Prototypes/DefaultInterfaceImplementation/*

DISTFILES = $(ROSLYN_FILES_FOR_MONO) $(ROSLYN_FILES_TO_COPY_FOR_MSBUILD) csi-test.csx

ifeq ($(PROFILE), $(DEFAULT_PROFILE))

TARGET_DIR = $(DESTDIR)$(mono_libdir)/mono/$(FRAMEWORK_VERSION)
MSBUILD_ROSLYN_DIR = $(DESTDIR)$(mono_libdir)/mono/msbuild/15.0/bin/Roslyn

install-local:
install-local: install-prototypes
$(MKINSTALLDIRS) $(TARGET_DIR)
$(INSTALL_LIB) $(ROSLYN_FILES_FOR_MONO) $(TARGET_DIR)
$(MKINSTALLDIRS) $(MSBUILD_ROSLYN_DIR)
$(INSTALL_LIB) $(ROSLYN_FILES_TO_COPY_FOR_MSBUILD) $(MSBUILD_ROSLYN_DIR)

(cd $(MSBUILD_ROSLYN_DIR); for asm in $(ROSLYN_FILES_FOR_MONO); do ln -fs ../../../../$(FRAMEWORK_VERSION)/$$(basename $$asm) . ; done)

install-prototypes:
$(MKINSTALLDIRS) $(TARGET_DIR)/dim
$(INSTALL_LIB) $(ROSLYN_DIM_FILES) $(TARGET_DIR)/dim

run-test-local: test-csi

test-csi:
Expand Down
6 changes: 6 additions & 0 deletions scripts/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ bin_SCRIPTS = \
peverify \
mcs \
csc \
csc-dim \
vbc \
csi \
mono-package-runtime \
Expand Down Expand Up @@ -160,6 +161,7 @@ EXTRA_DIST = \
update_submodules.sh \
mcs.in \
csc.in \
csc-dim.in \
vbc.in \
dmcs.in \
csi.in \
Expand Down Expand Up @@ -211,6 +213,10 @@ csc: csc.in Makefile
$(REWRITE_COMMON) $(srcdir)/csc.in > $@.tmp
mv -f $@.tmp $@

csc-dim: csc-dim.in Makefile
$(REWRITE_COMMON) $(srcdir)/csc-dim.in > $@.tmp
mv -f $@.tmp $@

vbc: vbc.in Makefile
$(REWRITE_COMMON) $(srcdir)/vbc.in > $@.tmp
mv -f $@.tmp $@
Expand Down
2 changes: 2 additions & 0 deletions scripts/csc-dim.in
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
#!/bin/sh
exec @bindir@/mono --gc-params=nursery-size=64m $MONO_OPTIONS @mono_instdir@/4.5/dim/csc.exe "$@"

0 comments on commit 535bfc5

Please sign in to comment.