new Makefile.vc

git-svn-id: svn://scm.gforge.inria.fr/svn/mpc/trunk@362 211d60ee-9f03-0410-a15a-8952a2c7a4e4

2 files changed, 91 insertions, 27 deletions

diff --git a/makefile.vc b/Makefile.vc
index 50b1853..0936d22 100644
--- a/makefile.vc
+++ b/Makefile.vc
@@ -39,18 +39,19 @@ CPP = cl.exe
 CC = cl.exe
 CDEFAULTFLAGS=/O2 /GR- /MD /nologo /EHs
 
-VERSION=0.5
+VERSION=0.5.1
 
 ######################## do not edit below this line ##########################
 
 DIRMPC=.\src\ 
+DIRMPCTESTS=$(DIRMPC)\..\tests\ 
 
-INCLUDES = /I$(GMPDIR)\include  /I$(MPFR)\include /I$(DIRMPC)
+INCLUDES = /I$(DIRMPC) /I$(GMPDIR)\include  /I$(MPFR)\include 
 CKERNELFLAGS = $(CDEFAULTFLAGS) /D__GMP_LIBGMP_DLL   $(INCLUDES)
 CFLAGS = $(CKERNELFLAGS)  /D__MPC_WITHIN_MPC /D_GMP_IEEE_FLOATS /DHAVE_CONFIG_H 
 
 TESTCOMPILE=$(CC) $(CKERNELFLAGS) $(DIRMPC)\..\tests\tgeneric.c $(DIRMPC)\..\tests\comparisons.c $(DIRMPC)\..\tests\read_data.c $(DIRMPC)\..\tests\random.c $(DIRMPC)\..\tests\ 
-MIDTESTCOMPILE=/link  /out:
+MIDTESTCOMPILE=/link  /out:$(DIRMPCTESTS)
 ENDTESTCOMPILE=/LIBPATH:"$(GMPDIR)\lib" libmpc.lib libmpfr.lib libgmp.lib
 
 
@@ -58,7 +59,8 @@ ENDTESTCOMPILE=/LIBPATH:"$(GMPDIR)\lib" libmpc.lib libmpfr.lib libgmp.lib
 # ls *.c | sed "s/\.c/\.obj/" | awk ' { printf("$(DIRMPC)\\%s \\\n",$1); } '
 #generate the CPPLINKOBJECTS : goto src and execute
 # ls *.c | sed "s/\.c/\.obj/" | awk ' { printf("%s \\\n",$1); } '
-#
+#generate the list for tests : goto tests and execute
+# ls *.c | sed "s/\.c//" | awk ' { printf("\t$(TESTCOMPILE)%s.c  $(MIDTESTCOMPILE)%s.exe $(ENDTESTCOMPILE)\n\tcd $(DIRMPCTESTS) && %s.exe && cd ..\n",$1,$1,$1,$1); } '
 
 LIBRARY = libmpc.dll
 LIBRARYLIB = libmpc.lib
@@ -67,6 +69,7 @@ CPPOBJECTS = $(DIRMPC)\abs.obj \
 $(DIRMPC)\add.obj \
 $(DIRMPC)\add_fr.obj \
 $(DIRMPC)\add_ui.obj \
+$(DIRMPC)\arg.obj \
 $(DIRMPC)\clear.obj \
 $(DIRMPC)\cmp.obj \
 $(DIRMPC)\cmp_si_si.obj \
@@ -82,6 +85,7 @@ $(DIRMPC)\fr_div.obj \
 $(DIRMPC)\fr_sub.obj \
 $(DIRMPC)\get_prec.obj \
 $(DIRMPC)\get_prec2.obj \
+$(DIRMPC)\imag.obj \
 $(DIRMPC)\init.obj \
 $(DIRMPC)\init2.obj \
 $(DIRMPC)\init3.obj \
@@ -96,12 +100,15 @@ $(DIRMPC)\mul_ui.obj \
 $(DIRMPC)\neg.obj \
 $(DIRMPC)\norm.obj \
 $(DIRMPC)\out_str.obj \
+$(DIRMPC)\proj.obj \
 $(DIRMPC)\random.obj \
 $(DIRMPC)\random2.obj \
+$(DIRMPC)\real.obj \
 $(DIRMPC)\set.obj \
 $(DIRMPC)\set_d_d.obj \
 $(DIRMPC)\set_dfl_prec.obj \
 $(DIRMPC)\set_fr.obj \
+$(DIRMPC)\set_fr_fr.obj \
 $(DIRMPC)\set_prec.obj \
 $(DIRMPC)\set_si_si.obj \
 $(DIRMPC)\set_ui_fr.obj \
@@ -119,7 +126,7 @@ $(DIRMPC)\uceil_log2.obj \
 $(DIRMPC)\ui_div.obj \
 $(DIRMPC)\ui_ui_sub.obj \
 $(DIRMPC)\urandom.obj \
-$(DIRMPC)\version.obj \
+$(DIRMPC)\version.obj
  
 
 
@@ -127,6 +134,7 @@ CPPLINKOBJECTS = abs.obj \
 add.obj \
 add_fr.obj \
 add_ui.obj \
+arg.obj \
 clear.obj \
 cmp.obj \
 cmp_si_si.obj \
@@ -142,6 +150,7 @@ fr_div.obj \
 fr_sub.obj \
 get_prec.obj \
 get_prec2.obj \
+imag.obj \
 init.obj \
 init2.obj \
 init3.obj \
@@ -156,12 +165,15 @@ mul_ui.obj \
 neg.obj \
 norm.obj \
 out_str.obj \
+proj.obj \
 random.obj \
 random2.obj \
+real.obj \
 set.obj \
 set_d_d.obj \
 set_dfl_prec.obj \
 set_fr.obj \
+set_fr_fr.obj \
 set_prec.obj \
 set_si_si.obj \
 set_ui_fr.obj \
@@ -179,7 +191,7 @@ uceil_log2.obj \
 ui_div.obj \
 ui_ui_sub.obj \
 urandom.obj \
-version.obj \
+version.obj
 
 #
 # Link target: automatically builds its object dependencies before
@@ -222,37 +234,88 @@ install:
 #
 check : test
 test : 
-	copy $(GMPDIR)\lib\*gmp*.dll .
-	copy $(MPFRDIR)\lib\*mpfr*.dll .
+	copy $(GMPDIR)\lib\*gmp*.dll $(DIRMPCTESTS)
+	copy $(MPFRDIR)\lib\*mpfr*.dll $(DIRMPCTESTS)
+	copy $(LIBRARY)  $(DIRMPCTESTS)
+        $(TESTCOMPILE)tabs.c  $(MIDTESTCOMPILE)tabs.exe $(ENDTESTCOMPILE)
+        cd $(DIRMPCTESTS) && tabs.exe && cd ..
         $(TESTCOMPILE)tadd.c  $(MIDTESTCOMPILE)tadd.exe $(ENDTESTCOMPILE)
-        tadd.exe
+        cd $(DIRMPCTESTS) && tadd.exe && cd ..
+        $(TESTCOMPILE)tadd_fr.c  $(MIDTESTCOMPILE)tadd_fr.exe $(ENDTESTCOMPILE)
+        cd $(DIRMPCTESTS) && tadd_fr.exe && cd ..
+        $(TESTCOMPILE)tadd_ui.c  $(MIDTESTCOMPILE)tadd_ui.exe $(ENDTESTCOMPILE)
+        cd $(DIRMPCTESTS) && tadd_ui.exe && cd ..
+        $(TESTCOMPILE)targ.c  $(MIDTESTCOMPILE)targ.exe $(ENDTESTCOMPILE)
+        cd $(DIRMPCTESTS) && targ.exe && cd ..
+        $(TESTCOMPILE)tconj.c  $(MIDTESTCOMPILE)tconj.exe $(ENDTESTCOMPILE)
+        cd $(DIRMPCTESTS) && tconj.exe && cd ..
         $(TESTCOMPILE)tcos.c  $(MIDTESTCOMPILE)tcos.exe $(ENDTESTCOMPILE)
-        tcos.exe
+        cd $(DIRMPCTESTS) && tcos.exe && cd ..
         $(TESTCOMPILE)tcosh.c  $(MIDTESTCOMPILE)tcosh.exe $(ENDTESTCOMPILE)
-        tcosh.exe
+        cd $(DIRMPCTESTS) && tcosh.exe && cd ..
         $(TESTCOMPILE)tdiv.c  $(MIDTESTCOMPILE)tdiv.exe $(ENDTESTCOMPILE)
-        tdiv.exe
-        $(TESTCOMPILE)test.c  $(MIDTESTCOMPILE)test.exe $(ENDTESTCOMPILE)
-        test.exe
+        cd $(DIRMPCTESTS) && tdiv.exe && cd ..
+        $(TESTCOMPILE)tdiv_2exp.c  $(MIDTESTCOMPILE)tdiv_2exp.exe $(ENDTESTCOMPILE)
+        cd $(DIRMPCTESTS) && tdiv_2exp.exe && cd ..
+        $(TESTCOMPILE)tdiv_fr.c  $(MIDTESTCOMPILE)tdiv_fr.exe $(ENDTESTCOMPILE)
+        cd $(DIRMPCTESTS) && tdiv_fr.exe && cd ..
+        $(TESTCOMPILE)tdiv_ui.c  $(MIDTESTCOMPILE)tdiv_ui.exe $(ENDTESTCOMPILE)
+        cd $(DIRMPCTESTS) && tdiv_ui.exe && cd ..
+#        $(TESTCOMPILE)test.c  $(MIDTESTCOMPILE)test.exe $(ENDTESTCOMPILE)
+#        cd $(DIRMPCTESTS) && test.exe && cd ..
         $(TESTCOMPILE)texp.c  $(MIDTESTCOMPILE)texp.exe $(ENDTESTCOMPILE)
-        texp.exe
+        cd $(DIRMPCTESTS) && texp.exe && cd ..
         $(TESTCOMPILE)tfr_div.c  $(MIDTESTCOMPILE)tfr_div.exe $(ENDTESTCOMPILE)
-        tfr_div.exe
+        cd $(DIRMPCTESTS) && tfr_div.exe && cd ..
+        $(TESTCOMPILE)tfr_sub.c  $(MIDTESTCOMPILE)tfr_sub.exe $(ENDTESTCOMPILE)
+        cd $(DIRMPCTESTS) && tfr_sub.exe && cd ..
+        $(TESTCOMPILE)timag.c  $(MIDTESTCOMPILE)timag.exe $(ENDTESTCOMPILE)
+        cd $(DIRMPCTESTS) && timag.exe && cd ..
         $(TESTCOMPILE)tlog.c  $(MIDTESTCOMPILE)tlog.exe $(ENDTESTCOMPILE)
-        tlog.exe
-        $(TESTCOMPILE)tmul.c  $(MIDTESTCOMPILE)tmul.exe $(ENDTESTCOMPILE)
-        tmul.exe
+        cd $(DIRMPCTESTS) && tlog.exe && cd ..
+#        $(TESTCOMPILE)tmul.c  $(MIDTESTCOMPILE)tmul.exe $(ENDTESTCOMPILE)
+#        cd $(DIRMPCTESTS) && tmul.exe && cd ..
+        $(TESTCOMPILE)tmul_2exp.c  $(MIDTESTCOMPILE)tmul_2exp.exe $(ENDTESTCOMPILE)
+        cd $(DIRMPCTESTS) && tmul_2exp.exe && cd ..
+        $(TESTCOMPILE)tmul_fr.c  $(MIDTESTCOMPILE)tmul_fr.exe $(ENDTESTCOMPILE)
+        cd $(DIRMPCTESTS) && tmul_fr.exe && cd ..
+        $(TESTCOMPILE)tmul_i.c  $(MIDTESTCOMPILE)tmul_i.exe $(ENDTESTCOMPILE)
+        cd $(DIRMPCTESTS) && tmul_i.exe && cd ..
+        $(TESTCOMPILE)tmul_si.c  $(MIDTESTCOMPILE)tmul_si.exe $(ENDTESTCOMPILE)
+        cd $(DIRMPCTESTS) && tmul_si.exe && cd ..
+        $(TESTCOMPILE)tmul_ui.c  $(MIDTESTCOMPILE)tmul_ui.exe $(ENDTESTCOMPILE)
+        cd $(DIRMPCTESTS) && tmul_ui.exe && cd ..
+        $(TESTCOMPILE)tneg.c  $(MIDTESTCOMPILE)tneg.exe $(ENDTESTCOMPILE)
+        cd $(DIRMPCTESTS) && tneg.exe && cd ..
+        $(TESTCOMPILE)tnorm.c  $(MIDTESTCOMPILE)tnorm.exe $(ENDTESTCOMPILE)
+        cd $(DIRMPCTESTS) && tnorm.exe && cd ..
+        $(TESTCOMPILE)tproj.c  $(MIDTESTCOMPILE)tproj.exe $(ENDTESTCOMPILE)
+        cd $(DIRMPCTESTS) && tproj.exe && cd ..
+        $(TESTCOMPILE)treal.c  $(MIDTESTCOMPILE)treal.exe $(ENDTESTCOMPILE)
+        cd $(DIRMPCTESTS) && treal.exe && cd ..
         $(TESTCOMPILE)tsin.c  $(MIDTESTCOMPILE)tsin.exe $(ENDTESTCOMPILE)
-        tsin.exe
+        cd $(DIRMPCTESTS) && tsin.exe && cd ..
         $(TESTCOMPILE)tsinh.c  $(MIDTESTCOMPILE)tsinh.exe $(ENDTESTCOMPILE)
-        tsinh.exe
+        cd $(DIRMPCTESTS) && tsinh.exe && cd ..
         $(TESTCOMPILE)tsqr.c  $(MIDTESTCOMPILE)tsqr.exe $(ENDTESTCOMPILE)
-        tsqr.exe
+        cd $(DIRMPCTESTS) && tsqr.exe && cd ..
         $(TESTCOMPILE)tsqrt.c  $(MIDTESTCOMPILE)tsqrt.exe $(ENDTESTCOMPILE)
-        tsqrt.exe
+        cd $(DIRMPCTESTS) && tsqrt.exe && cd ..
         $(TESTCOMPILE)tsub.c  $(MIDTESTCOMPILE)tsub.exe $(ENDTESTCOMPILE)
-        tsub.exe
+        cd $(DIRMPCTESTS) && tsub.exe && cd ..
+        $(TESTCOMPILE)tsub_fr.c  $(MIDTESTCOMPILE)tsub_fr.exe $(ENDTESTCOMPILE)
+        cd $(DIRMPCTESTS) && tsub_fr.exe && cd ..
+        $(TESTCOMPILE)tsub_ui.c  $(MIDTESTCOMPILE)tsub_ui.exe $(ENDTESTCOMPILE)
+        cd $(DIRMPCTESTS) && tsub_ui.exe && cd ..
         $(TESTCOMPILE)ttan.c  $(MIDTESTCOMPILE)ttan.exe $(ENDTESTCOMPILE)
-        ttan.exe
+        cd $(DIRMPCTESTS) && ttan.exe && cd ..
         $(TESTCOMPILE)ttanh.c  $(MIDTESTCOMPILE)ttanh.exe $(ENDTESTCOMPILE)
-        ttanh.exe
+        cd $(DIRMPCTESTS) && ttanh.exe && cd ..
+        $(TESTCOMPILE)tui_div.c  $(MIDTESTCOMPILE)tui_div.exe $(ENDTESTCOMPILE)
+        cd $(DIRMPCTESTS) && tui_div.exe && cd ..
+        $(TESTCOMPILE)tui_ui_sub.c  $(MIDTESTCOMPILE)tui_ui_sub.exe $(ENDTESTCOMPILE)
+        cd $(DIRMPCTESTS) && tui_ui_sub.exe && cd ..
+        @echo --------------------------------------------------
+        @echo All tests passed
+        @echo --------------------------------------------------
+        
diff --git a/NEWS b/NEWS
index 62db080..85a7dee 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,7 @@
 Recent changes:
   - New macros:
-   - version number: MPC_VERSION_NUM, MPC_VERSION
+    - version number: MPC_VERSION_NUM, MPC_VERSION
+  - Makefile.vc updated (thanks to Mickael Gastineau)
 
 Changes in version 0.5.1:
   - New functions: