Author: raja
Date: 2005-11-16 05:28:50 -0500 (Wed, 16 Nov 2005)
New Revision: 53103
Modified:
trunk/mcs/build/ChangeLog
trunk/mcs/build/library.make
trunk/mcs/build/platforms/win32.make
Log:
Revert SVN r53054
Modified: trunk/mcs/build/ChangeLog
===================================================================
--- trunk/mcs/build/ChangeLog 2005-11-16 10:18:00 UTC (rev 53102)
+++ trunk/mcs/build/ChangeLog 2005-11-16 10:28:50 UTC (rev 53103)
@@ -1,6 +1,3 @@
-2005-11-15 Vlad Spivak <[EMAIL PROTECTED]>
- * net_1_1_java profile related changes
-
2005-10-03 Raja R Harinath <[EMAIL PROTECTED]>
* profiles/basic.make (monolite_flag, use_monolite): New. Used to
Modified: trunk/mcs/build/library.make
===================================================================
--- trunk/mcs/build/library.make 2005-11-16 10:18:00 UTC (rev 53102)
+++ trunk/mcs/build/library.make 2005-11-16 10:28:50 UTC (rev 53103)
@@ -41,7 +41,6 @@
the_lib = $(topdir)/class/lib/$(PROFILE)/$(LIBRARY_NAME)
the_pdb = $(the_lib:.dll=.pdb)
the_mdb = $(the_lib).mdb
-the_jar = $(the_lib:.dll=.jar)
library_CLEAN_FILES += $(makefrag) $(the_lib) $(the_pdb) $(the_mdb)
ifdef LIBRARY_NEEDS_POSTPROCESSING
@@ -279,24 +278,14 @@
$(build_lib): $(response) $(sn) $(BUILT_SOURCES)
ifdef LIBRARY_USE_INTERMEDIATE_FILE
$(LIBRARY_COMPILE) $(LIBRARY_FLAGS) $(LIB_MCS_FLAGS) -target:library
-out:$(LIBRARY_NAME) $(BUILT_SOURCES_cmdline) @$(response)
-ifneq (net_1_1_java,$(PROFILE))
$(SN) $(SNFLAGS) $(LIBRARY_NAME) $(LIBRARY_SNK)
-endif
mv $(LIBRARY_NAME) $@
-ifeq (net_1_1_java,$(PROFILE))
- mv $(LIBRARY_NAME:.dll=.pdb) $(the_pdb)
-endif
test ! -f $(LIBRARY_NAME).mdb || mv $(LIBRARY_NAME).mdb [EMAIL
PROTECTED]
else
$(LIBRARY_COMPILE) $(LIBRARY_FLAGS) $(LIB_MCS_FLAGS) -target:library
-out:$@ $(BUILT_SOURCES_cmdline) @$(response)
-ifneq (net_1_1_java,$(PROFILE))
$(SN) $(SNFLAGS) $@ $(LIBRARY_SNK)
endif
-endif
-ifeq (net_1_1_java,$(PROFILE))
- converter.exe /debug:3 ../../class/lib/$(PROFILE)/$(LIBRARY)
/out:$(the_jar) $(KEY) /lib:../../class/lib/net_1_1_java
-endif
$(makefrag): $(sourcefile)
@echo Creating $@ ...
@sed 's,^,$(build_lib): ,' $< >$@
Modified: trunk/mcs/build/platforms/win32.make
===================================================================
--- trunk/mcs/build/platforms/win32.make 2005-11-16 10:18:00 UTC (rev
53102)
+++ trunk/mcs/build/platforms/win32.make 2005-11-16 10:28:50 UTC (rev
53103)
@@ -9,11 +9,6 @@
PLATFORM_CORLIB = mscorlib.dll
EXTERNAL_MCS = mcs
-
-ifeq (net_1_1_java,$(PROFILE))
-EXTERNAL_MCS = csc.exe
-endif
-
EXTERNAL_MBAS = vbc.exe
EXTERNAL_RUNTIME =
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
