[svn] r6203: nemerle/trunk: lib/AssemblyInfo.n macros/AssemblyInfo.n ncc/Makefile ncc/main.n ncc/misc/Asse...

nazgul svnadmin at nemerle.org
Thu Apr 27 18:22:34 CEST 2006 

Log:
Use command line option for specifying strong name key. Do not include key information in source code

Author: nazgul
Date: Thu Apr 27 18:22:27 2006
New Revision: 6203

Modified:
   nemerle/trunk/lib/AssemblyInfo.n
   nemerle/trunk/macros/AssemblyInfo.n
   nemerle/trunk/ncc/Makefile
   nemerle/trunk/ncc/main.n
   nemerle/trunk/ncc/misc/AssemblyInfo.n
   nemerle/trunk/tools/cs2n/AssemblyInfo.cs
   nemerle/trunk/tools/cs2n/AssemblyInfo.n
   nemerle/trunk/tools/cs2n/Makefile
   nemerle/trunk/tools/nemerlish/Makefile
   nemerle/trunk/tools/nemerlish/eval.n
   nemerle/trunk/tools/nemerlish/main.n

Modified: nemerle/trunk/lib/AssemblyInfo.n
==============================================================================
--- nemerle/trunk/lib/AssemblyInfo.n	(original)
+++ nemerle/trunk/lib/AssemblyInfo.n	Thu Apr 27 18:22:27 2006
@@ -31,9 +31,8 @@
 [assembly: System.Reflection.AssemblyDescription("Nemerle (http://nemerle.org) Functional Library")]
 [assembly: System.Reflection.AssemblyCompany("University of Wroclaw")]
 [assembly: System.Reflection.AssemblyProduct("Nemerle Library")]
-[assembly: System.Reflection.AssemblyCopyright("Copyright @ University of Wroclaw 2003-2005")]
+[assembly: System.Reflection.AssemblyCopyright("Copyright @ University of Wroclaw 2003-2006")]
 
 [assembly: System.Reflection.AssemblyVersion("0.9.2.*")]
-[assembly: System.Reflection.AssemblyKeyFile("../misc/keys/Nemerle.snk")]
 [assembly: System.Runtime.InteropServices.ComVisible (false)]
 

Modified: nemerle/trunk/macros/AssemblyInfo.n
==============================================================================
--- nemerle/trunk/macros/AssemblyInfo.n	(original)
+++ nemerle/trunk/macros/AssemblyInfo.n	Thu Apr 27 18:22:27 2006
@@ -31,8 +31,7 @@
 [assembly: System.Reflection.AssemblyDescription("Nemerle (http://nemerle.org) Language Macros Library")]
 [assembly: System.Reflection.AssemblyCompany("University of Wroclaw")]
 [assembly: System.Reflection.AssemblyProduct("Nemerle Macros Library")]
-[assembly: System.Reflection.AssemblyCopyright("Copyright @ University of Wroclaw 2003-2005")]
+[assembly: System.Reflection.AssemblyCopyright("Copyright @ University of Wroclaw 2003-2006")]
 
 [assembly: System.Reflection.AssemblyVersion("0.9.2.*")]
-[assembly: System.Reflection.AssemblyKeyFile("../misc/keys/Nemerle.Compiler.snk")]
 [assembly: System.Runtime.InteropServices.ComVisible (false)]

Modified: nemerle/trunk/ncc/Makefile
==============================================================================
--- nemerle/trunk/ncc/Makefile	(original)
+++ nemerle/trunk/ncc/Makefile	Thu Apr 27 18:22:27 2006
@@ -39,6 +39,8 @@
 COMPILER_DEP  = $(COMPILER_PATH)ncc.exe $(COMPILER_PATH)Nemerle.Macros.dll
 EXECUTE       = $(NET_ENGINE) $(NET_FLAGS)
 RUN_COMPILER  = $(Q)$(TIME) $(EXECUTE) $(COMPILER) -no-stdlib -r:mscorlib -r:System -r:System.Xml $(NCC_FLAGS)
+SNK_LIB       = -keyfile:../misc/keys/Nemerle.snk
+SNK_COMPILER  = -keyfile:../misc/keys/Nemerle.Compiler.snk
 
 GENERIC_SRC =
 
@@ -195,16 +197,16 @@
 	$(Q)cd .. && $(MAKE) config.mak
 
 stage1:
-	$(Q)$(MAKE) STAGE=$@ COMPILER_PATH=../boot/ aux-stage
+	$(Q)$(MAKE) STAGE=$@ OUTF_STAGE=$@. COMPILER_PATH=../boot/ aux-stage
 
 stage2:
-	$(Q)$(MAKE) STAGE=$@ COMPILER_PATH=out.stage1/ aux-stage
+	$(Q)$(MAKE) STAGE=$@ OUTF_STAGE=$@. COMPILER_PATH=out.stage1/ aux-stage
 
 stage3:
-	$(Q)$(MAKE) STAGE=$@ COMPILER_PATH=out.stage2/ last-stage
+	$(Q)$(MAKE) STAGE=$@ OUTF_STAGE= COMPILER_PATH=out.stage2/ last-stage
 
 t3:
-	$(MAKE) STAGE=stage1 NEM_FLAGS="$(NEM_FLAGS) -def:T3" out.stage1/Nemerle.Compiler.stage1.dll
+	$(MAKE) STAGE=stage1 OUTF_STAGE=stage1. NEM_FLAGS="$(NEM_FLAGS) -def:T3" out.stage1/Nemerle.Compiler.stage1.dll
 
 aux-stage:
 	$(MKDIR) out.$(STAGE)
@@ -229,10 +231,10 @@
 		out.$(STAGE)/ncc.exe
 
 nc:
-	$(MAKE) STAGE=stage1 out.stage1/Nemerle.Compiler.stage1.dll
+	$(MAKE) STAGE=stage1 OUTF_STAGE=stage1. out.stage1/Nemerle.Compiler.stage1.dll
 
 lib:
-	$(MAKE) STAGE=stage1 out.stage1/Nemerle.stage1.dll
+	$(MAKE) STAGE=stage1 OUTF_STAGE=stage1. out.stage1/Nemerle.stage1.dll
 
 #boot: stage1 stage2 stage3 compare ngen-stage3
 boot: stage1 stage2 stage3
@@ -306,81 +308,35 @@
 	$(Q)diff -u -w $(CMP_TARGET)2.il $(CMP_TARGET)3.il
 	$(Q)rm -f $(CMP_TARGET)2.il $(CMP_TARGET)3.il
 
-out.$(STAGE)/Nemerle.dll out.$(STAGE)/Nemerle.$(STAGE).dll: \
+out.$(STAGE)/Nemerle.$(OUTF_STAGE)dll: \
 		$(COMPILER_DEP) $(NEMERLE_DLL_SRC)
 	$(COMP) "[$(STAGE)]" Nemerle.dll
-	$(Q)$(RUN_COMPILER) -target-library -out:$@ $(GENERIC_SRC) $(NEMERLE_DLL_SRC)
+	$(Q)$(RUN_COMPILER) -target-library $(SNK_LIB) -out:$@ $(GENERIC_SRC) $(NEMERLE_DLL_SRC)
 	$(Q)touch $@.done
 
-out.$(STAGE)/Nemerle.Compiler.dll: \
-		$(COMPILER_DEP) out.$(STAGE)/Nemerle.dll $(NEMERLE_COMPILER_DLL_SRC)
+out.$(STAGE)/Nemerle.Compiler.$(OUTF_STAGE)dll: \
+		$(COMPILER_DEP) out.$(STAGE)/Nemerle.$(OUTF_STAGE)dll $(NEMERLE_COMPILER_DLL_SRC)
 	$(COMP) "[$(STAGE)]" Nemerle.Compiler.dll
-	$(Q)$(RUN_COMPILER) -target-library -out:$@ \
-		-reference:out.$(STAGE)/Nemerle.dll \
+	$(Q)$(RUN_COMPILER) -target-library $(SNK_COMPILER) -out:$@ \
+		-reference:out.$(STAGE)/Nemerle.$(OUTF_STAGE)dll \
 		$(GENERIC_SRC) $(NEMERLE_COMPILER_DLL_SRC)
 	$(Q)touch $@.done
 
-out.$(STAGE)/Nemerle.Compiler.$(STAGE).dll: \
-		$(COMPILER_DEP) out.$(STAGE)/Nemerle.$(STAGE).dll $(NEMERLE_COMPILER_DLL_SRC)
-	$(COMP) "[$(STAGE)]" Nemerle.Compiler.dll
-	$(Q)$(RUN_COMPILER) -target-library -out:$@ \
-		-reference:out.$(STAGE)/Nemerle.$(STAGE).dll \
-		$(GENERIC_SRC) $(NEMERLE_COMPILER_DLL_SRC)
-	$(Q)touch $@.done
-
-out.stage1/Nemerle.Macros.dll: $(COMPILER_DEP) out.stage1/Nemerle.stage1.dll \
-		out.stage1/Nemerle.Compiler.stage1.dll $(STDMACROS_DLL_SRC)
-	$(COMP) "[stage1]" Nemerle.Macros.dll
-	$(Q)$(RUN_COMPILER) -target-library -out:$@ \
-		-reference:out.stage1/Nemerle.stage1.dll \
-		-reference:out.stage1/Nemerle.Compiler.stage1.dll \
-		$(GENERIC_SRC) $(STDMACROS_DLL_SRC)
-	$(Q)touch $@.done
-
-out.stage2/Nemerle.Macros.dll: $(COMPILER_DEP) out.stage2/Nemerle.stage2.dll \
-		out.stage2/Nemerle.Compiler.stage2.dll $(STDMACROS_DLL_SRC)
-	$(COMP) "[stage2]" Nemerle.Macros.dll
-	$(Q)$(RUN_COMPILER) -target-library -out:$@ \
-		-reference:out.stage2/Nemerle.stage2.dll \
-		-reference:out.stage2/Nemerle.Compiler.stage2.dll \
-		$(GENERIC_SRC) $(STDMACROS_DLL_SRC)
-	$(Q)touch $@.done
-
-out.stage3/Nemerle.Macros.dll: \
-	$(COMPILER_DEP) out.$(STAGE)/Nemerle.dll \
-		out.$(STAGE)/Nemerle.Compiler.dll $(STDMACROS_DLL_SRC)
-	$(COMP) "[stage3]" Nemerle.Macros.dll
-	$(Q)$(RUN_COMPILER) -target-library -out:$@ \
-		-reference:out.$(STAGE)/Nemerle.dll \
-		-reference:out.$(STAGE)/Nemerle.Compiler.dll \
+out.$(STAGE)/Nemerle.Macros.dll: $(COMPILER_DEP) out.$(STAGE)/Nemerle.$(OUTF_STAGE)dll \
+		out.$(STAGE)/Nemerle.Compiler.$(OUTF_STAGE)dll $(STDMACROS_DLL_SRC)
+	$(COMP) "[$(STAGE)]" Nemerle.Macros.dll
+	$(Q)$(RUN_COMPILER) -target-library $(SNK_COMPILER) -out:$@ \
+		-reference:out.$(STAGE)/Nemerle.$(OUTF_STAGE)dll \
+		-reference:out.$(STAGE)/Nemerle.Compiler.$(OUTF_STAGE)dll \
 		$(GENERIC_SRC) $(STDMACROS_DLL_SRC)
 	$(Q)touch $@.done
 
-out.stage1/ncc.exe: $(COMPILER_DEP) out.stage1/Nemerle.stage1.dll \
-		out.stage1/Nemerle.Compiler.stage1.dll $(NCC_EXE_SRC)
-	$(COMP) "[stage1]" ncc.exe
-	$(Q)$(RUN_COMPILER) -target-exe -out:$@ \
-		-reference:out.stage1/Nemerle.stage1.dll \
-		-reference:out.stage1/Nemerle.Compiler.stage1.dll \
-		$(GENERIC_SRC) $(NCC_EXE_SRC)
-	$(Q)touch $@.done
-
-out.stage2/ncc.exe: $(COMPILER_DEP) out.stage2/Nemerle.stage2.dll \
-		out.stage2/Nemerle.Compiler.stage2.dll $(NCC_EXE_SRC)
-	$(COMP) "[stage2]" ncc.exe
-	$(Q)$(RUN_COMPILER) -target-exe -out:$@ \
-		-reference:out.stage2/Nemerle.stage2.dll \
-		-reference:out.stage2/Nemerle.Compiler.stage2.dll \
-		$(GENERIC_SRC) $(NCC_EXE_SRC)
-	$(Q)touch $@.done
-
-out.stage3/ncc.exe: \
-		$(COMPILER_DEP) out.$(STAGE)/Nemerle.dll \
-		out.$(STAGE)/Nemerle.Compiler.dll $(NCC_EXE_SRC)
-	$(COMP) "[stage3]" ncc.exe
-	$(Q)$(RUN_COMPILER) -target-exe -out:$@ \
-		-reference:out.$(STAGE)/Nemerle.dll \
-		-reference:out.$(STAGE)/Nemerle.Compiler.dll \
+out.$(STAGE)/ncc.exe: $(COMPILER_DEP) out.$(STAGE)/Nemerle.$(OUTF_STAGE)dll \
+		out.$(STAGE)/Nemerle.Compiler.$(OUTF_STAGE)dll $(NCC_EXE_SRC)
+	$(COMP) "[$(STAGE)]" ncc.exe
+	$(Q)$(RUN_COMPILER) -target-exe $(SNK_COMPILER) -out:$@ \
+		-reference:out.$(STAGE)/Nemerle.$(OUTF_STAGE)dll \
+		-reference:out.$(STAGE)/Nemerle.Compiler.$(OUTF_STAGE)dll \
 		$(GENERIC_SRC) $(NCC_EXE_SRC)
 	$(Q)touch $@.done
 

Modified: nemerle/trunk/ncc/main.n
==============================================================================
--- nemerle/trunk/ncc/main.n	(original)
+++ nemerle/trunk/ncc/main.n	Thu Apr 27 18:22:27 2006
@@ -46,7 +46,6 @@
 [assembly: System.Reflection.AssemblyCopyright("Copyright @ University of Wroclaw 2003-2005")]
 
 [assembly: System.Reflection.AssemblyVersion("0.9.2.*")]
-[assembly: System.Reflection.AssemblyKeyFile("../misc/keys/Nemerle.Compiler.snk")]
 
 namespace Nemerle.CommandlineCompiler
 {

Modified: nemerle/trunk/ncc/misc/AssemblyInfo.n
==============================================================================
--- nemerle/trunk/ncc/misc/AssemblyInfo.n	(original)
+++ nemerle/trunk/ncc/misc/AssemblyInfo.n	Thu Apr 27 18:22:27 2006
@@ -34,5 +34,4 @@
 [assembly: System.Reflection.AssemblyCopyright("Copyright @ University of Wroclaw 2003-2005")]
 
 [assembly: System.Reflection.AssemblyVersion("0.9.2.*")]
-[assembly: System.Reflection.AssemblyKeyFile("../misc/keys/Nemerle.Compiler.snk")]
 [assembly: System.Runtime.InteropServices.ComVisible (false)]

Modified: nemerle/trunk/tools/cs2n/AssemblyInfo.cs
==============================================================================
--- nemerle/trunk/tools/cs2n/AssemblyInfo.cs	(original)
+++ nemerle/trunk/tools/cs2n/AssemblyInfo.cs	Thu Apr 27 18:22:27 2006
@@ -32,9 +32,8 @@
 [assembly: System.Reflection.AssemblyDescription("C# to Nemerle (http://nemerle.org) converter tool")]
 [assembly: System.Reflection.AssemblyCompany("University of Wroclaw")]
 [assembly: System.Reflection.AssemblyProduct("C# to Nemerle converter")]
-[assembly: System.Reflection.AssemblyCopyright("Copyright @ University of Wroclaw 2003-2005")]
+[assembly: System.Reflection.AssemblyCopyright("Copyright @ University of Wroclaw 2003-2006")]
 
 [assembly: System.Reflection.AssemblyVersion("0.9.2.*")]
-[assembly: AssemblyKeyFile("../../misc/keys/Nemerle.Compiler.snk")]
 [assembly: System.Runtime.InteropServices.ComVisible (false)]
 

Modified: nemerle/trunk/tools/cs2n/AssemblyInfo.n
==============================================================================
--- nemerle/trunk/tools/cs2n/AssemblyInfo.n	(original)
+++ nemerle/trunk/tools/cs2n/AssemblyInfo.n	Thu Apr 27 18:22:27 2006
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003-2005 The University of Wroclaw.
+ * Copyright (c) 2003-2006 The University of Wroclaw.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -30,9 +30,8 @@
 [assembly: System.Reflection.AssemblyDescription("C# to Nemerle (http://nemerle.org) converter tool")]
 [assembly: System.Reflection.AssemblyCompany("University of Wroclaw")]
 [assembly: System.Reflection.AssemblyProduct("C# to Nemerle converter")]
-[assembly: System.Reflection.AssemblyCopyright("Copyright @ University of Wroclaw 2003-2005")]
+[assembly: System.Reflection.AssemblyCopyright("Copyright @ University of Wroclaw 2003-2006")]
 
 [assembly: System.Reflection.AssemblyVersion("0.9.2.*")]
-[assembly: System.Reflection.AssemblyKeyFile("../../misc/keys/Nemerle.Compiler.snk")]
 [assembly: System.Runtime.InteropServices.ComVisible (false)]
 

Modified: nemerle/trunk/tools/cs2n/Makefile
==============================================================================
--- nemerle/trunk/tools/cs2n/Makefile	(original)
+++ nemerle/trunk/tools/cs2n/Makefile	Thu Apr 27 18:22:27 2006
@@ -39,6 +39,7 @@
 NCC_DIR = $(TOP_LEVEL)/ncc/out.stage3
 NCC = $(EXECUTE) $(NCC_DIR)/ncc.exe
 MCS = $(CSC)
+SNK_COMPILER = /keyfile:$(TOP_LEVEL)/misc/keys/Nemerle.Compiler.snk
 
 NEMERLE_DLLS = Nemerle.dll
 ANTLR_DLL = antlr.runtime.dll
@@ -71,10 +72,10 @@
 	$(NCC) -greedy- -texe -r:./antlr.runtime.dll -r:Nemerle.CSharp.CS.dll -r:Nemerle.CSharp.dll -o:$@ $(CS2N_EXE_SOURCES)
 
 Nemerle.CSharp.CS.dll : Nemerle.CSharp.dll $(GENERATED_SOURCES_PARSER) $(ANTLR_DLL)
-	$(MCS) /t:library /r:./antlr.runtime.dll /r:Nemerle.CSharp.dll /r:Nemerle.dll -out:$@ $(GENERATED_SOURCES) AssemblyInfo.cs
+	$(MCS) /t:library /r:./antlr.runtime.dll /r:Nemerle.CSharp.dll /r:Nemerle.dll -out:$@ $(SNK_COMPILER) $(GENERATED_SOURCES) AssemblyInfo.cs
 
 Nemerle.CSharp.dll : $(NEMERLE_CSHARP_DLL_SOURCES) $(ANTLR_DLL)
-	$(NCC) -tdll -r:./antlr.runtime.dll -r:Nemerle.Compiler.dll -o:$@ $(NEMERLE_CSHARP_DLL_SOURCES) 
+	$(NCC) -tdll -r:./antlr.runtime.dll -r:Nemerle.Compiler.dll -o:$@ $(SNK_COMPILER) $(NEMERLE_CSHARP_DLL_SOURCES) 
 
 $(GENERATED_SOURCES_PARSER): $(GRAMMAR_FILE)
 	$(ANTLR) $(GRAMMAR_FILE) 2> error_log

Modified: nemerle/trunk/tools/nemerlish/Makefile
==============================================================================
--- nemerle/trunk/tools/nemerlish/Makefile	(original)
+++ nemerle/trunk/tools/nemerlish/Makefile	Thu Apr 27 18:22:27 2006
@@ -11,16 +11,17 @@
 EXECUTE = $(NET_ENGINE) $(NET_FLAGS)
 NCC_DIR = $(TOP_LEVEL)/ncc/out.stage3
 NCC = $(EXECUTE) $(NCC_DIR)/ncc.exe
+SNK_COMPILER = -keyfile:$(TOP_LEVEL)/misc/keys/Nemerle.Compiler.snk
 
 NEMISH_SRC = interp.n main.n readline.n
 
 all:	Nemerle.Evaluation.dll nemish.exe
 
 Nemerle.Evaluation.dll: eval.n $(NCC_DIR)/Nemerle.dll $(NCC_DIR)/Nemerle.Compiler.dll $(NCC_DIR)/Nemerle.Macros.dll 
-	$(NCC) -r Nemerle.Compiler.dll -t library -o Nemerle.Evaluation.dll eval.n
+	$(NCC) -r Nemerle.Compiler.dll -t library $(SNK_COMPILER) -o Nemerle.Evaluation.dll eval.n
 
 nemish.exe: $(NEMISH_SRC) Nemerle.Evaluation.dll
-	$(NCC) -r Nemerle.Evaluation.dll -o nemish.exe $(NEMISH_SRC)
+	$(NCC) -r Nemerle.Evaluation.dll -o nemish.exe $(SNK_COMPILER) $(NEMISH_SRC)
 
 check: all
 	$(MAKE) -C tests all

Modified: nemerle/trunk/tools/nemerlish/eval.n
==============================================================================
--- nemerle/trunk/tools/nemerlish/eval.n	(original)
+++ nemerle/trunk/tools/nemerlish/eval.n	Thu Apr 27 18:22:27 2006
@@ -8,9 +8,8 @@
 [assembly: System.Reflection.AssemblyDescription("Nemerle (http://nemerle.org) Runtime evaluation library")]
 [assembly: System.Reflection.AssemblyCompany("University of Wroclaw")]
 [assembly: System.Reflection.AssemblyProduct("Nemerle Evaluation Library")]
-[assembly: System.Reflection.AssemblyCopyright("Copyright @ University of Wroclaw 2005")]
+[assembly: System.Reflection.AssemblyCopyright("Copyright @ University of Wroclaw 2005-2006")]
 
-[assembly: System.Reflection.AssemblyKeyFile("../../misc/keys/Nemerle.Compiler.snk")]
 [assembly: System.Reflection.AssemblyVersion("0.9.2.*")]
 [assembly: System.Runtime.InteropServices.ComVisible (false)]
 

Modified: nemerle/trunk/tools/nemerlish/main.n
==============================================================================
--- nemerle/trunk/tools/nemerlish/main.n	(original)
+++ nemerle/trunk/tools/nemerlish/main.n	Thu Apr 27 18:22:27 2006
@@ -14,9 +14,8 @@
 [assembly: System.Reflection.AssemblyDescription("Nemerle (http://nemerle.org) Interactive Shell")]
 [assembly: System.Reflection.AssemblyCompany("University of Wroclaw")]
 [assembly: System.Reflection.AssemblyProduct("Nemerle Interactive Shell")]
-[assembly: System.Reflection.AssemblyCopyright("Copyright @ University of Wroclaw 2005")]
+[assembly: System.Reflection.AssemblyCopyright("Copyright @ University of Wroclaw 2005-2006")]
 
-[assembly: System.Reflection.AssemblyKeyFile("../../misc/keys/Nemerle.Compiler.snk")]
 [assembly: System.Reflection.AssemblyVersion("0.9.2.*")]

More information about the svn mailing list