simplectest-develop

[simplectest-dev] SF.net SVN: simplectest:[34] trunk/examples/tup

[<ml...@us...>]

Revision: 34
          http://simplectest.svn.sourceforge.net/simplectest/?rev=34&view=rev
Author:   mlg7
Date:     2011-03-10 15:03:17 +0000 (Thu, 10 Mar 2011)

Log Message:
-----------
changed attributes of tup/; the other files are in intermediate state (svn just commits them along with the directory)

Modified Paths:
--------------
    trunk/examples/tup/Tupfile
    trunk/examples/tup/tests/Tupfile

Added Paths:
-----------
    trunk/examples/tup/maincpp/
    trunk/examples/tup/maincpp/Tupfile
    trunk/examples/tup/maincpp/main.cpp

Property Changed:
----------------
    trunk/examples/tup/


Property changes on: trunk/examples/tup
___________________________________________________________________
Modified: svn:externals
   - ../../aux-shared/hello-test/whatWasGenerated whatWasGenerated
../../aux-shared/hello-test/tests/pos.cpp tests/pos.cpp
../../aux-shared/hello-test/tests/neg.cpp tests/neg.cpp
../../aux-shared/hello-test/main.cpp main.cpp
../../aux-shared/hello-test/add.cpp add.cpp
../../aux-shared/hello-test/sub.cpp sub.cpp
../../aux-shared/hello-test/add.h add.h
../../aux-shared/hello-test/sub.h sub.h
../../aux-shared/hello-test/read.me read.me
../../src/license.txt license.txt
../../src/genmaintest.readme genmaintest.readme
../../src/genmaintest.py genmaintest.py
../../src/tests.h tests/tests.h

   + ../../aux-shared/hello-test/whatWasGenerated whatWasGenerated
../../aux-shared/hello-test/tests/pos.cpp tests/pos.cpp
../../aux-shared/hello-test/tests/neg.cpp tests/neg.cpp
../../aux-shared/hello-test/add.cpp add.cpp
../../aux-shared/hello-test/sub.cpp sub.cpp
../../aux-shared/hello-test/add.h add.h
../../aux-shared/hello-test/sub.h sub.h
../../aux-shared/hello-test/read.me read.me
../../src/license.txt license.txt
../../src/genmaintest.readme genmaintest.readme
../../src/genmaintest.py genmaintest.py
../../src/tests.h tests/tests.h


Modified: trunk/examples/tup/Tupfile
===================================================================
--- trunk/examples/tup/Tupfile	2011-03-07 12:11:57 UTC (rev 33)
+++ trunk/examples/tup/Tupfile	2011-03-10 15:03:17 UTC (rev 34)
@@ -1 +1,5 @@
-#not yet implemented
+
+sources_cpp = add.cpp sub.cpp
+
+: foreach $(sources_cpp) |> g++ -c %f -o %o |> %B.o {objs}
+: {objs} maincpp/*.o |> g++ %f -o %o |> main

Added: trunk/examples/tup/maincpp/Tupfile
===================================================================
--- trunk/examples/tup/maincpp/Tupfile	                        (rev 0)
+++ trunk/examples/tup/maincpp/Tupfile	2011-03-10 15:03:17 UTC (rev 34)
@@ -0,0 +1,2 @@
+
+: main.cpp |>  g++ -c %f -o %o |> %B.o

Added: trunk/examples/tup/maincpp/main.cpp
===================================================================
--- trunk/examples/tup/maincpp/main.cpp	                        (rev 0)
+++ trunk/examples/tup/maincpp/main.cpp	2011-03-10 15:03:17 UTC (rev 34)
@@ -0,0 +1,9 @@
+#include <stdio.h>
+#include "../add.h"
+#include "../sub.h"
+int main()
+{
+    printf("add(2,3)=%x\n",add(2,3));
+    printf("sub(2,3)=%x\n",sub(2,3));
+    return 0;
+}

Modified: trunk/examples/tup/tests/Tupfile
===================================================================
--- trunk/examples/tup/tests/Tupfile	2011-03-07 12:11:57 UTC (rev 33)
+++ trunk/examples/tup/tests/Tupfile	2011-03-10 15:03:17 UTC (rev 34)
@@ -1 +1,5 @@
-#not yet implemented
+
+: maintest.c00 |> cp %f %o; ../genmaintest.py %o *.cpp |> generated.maintest.cpp
+: foreach *.cpp |> g++ -c %f -o %o |> %B.o
+: *.o ../*.o |> g++ %f -o %o |> test
+


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[simplectest-dev] SF.net SVN: simplectest:[35] trunk/examples/tup

[<ml...@us...>]

Revision: 35
          http://simplectest.svn.sourceforge.net/simplectest/?rev=35&view=rev
Author:   mlg7
Date:     2011-03-11 14:30:11 +0000 (Fri, 11 Mar 2011)

Log Message:
-----------
now works with tup

Modified Paths:
--------------
    trunk/examples/tup/Tupfile
    trunk/examples/tup/maincpp/Tupfile
    trunk/examples/tup/tests/Tupfile

Added Paths:
-----------
    trunk/examples/tup/Tuprules.tup
    trunk/examples/tup/tests/maintest.c00

Modified: trunk/examples/tup/Tupfile
===================================================================
--- trunk/examples/tup/Tupfile	2011-03-10 15:03:17 UTC (rev 34)
+++ trunk/examples/tup/Tupfile	2011-03-11 14:30:11 UTC (rev 35)
@@ -1,5 +1,5 @@
 
-sources_cpp = add.cpp sub.cpp
+include_rules
 
-: foreach $(sources_cpp) |> g++ -c %f -o %o |> %B.o {objs}
-: {objs} maincpp/*.o |> g++ %f -o %o |> main
+: foreach *.cpp |> !cxx |> %B.o {objs}
+: {objs} maincpp/*.o |> !link |> main

Added: trunk/examples/tup/Tuprules.tup
===================================================================
--- trunk/examples/tup/Tuprules.tup	                        (rev 0)
+++ trunk/examples/tup/Tuprules.tup	2011-03-11 14:30:11 UTC (rev 35)
@@ -0,0 +1,6 @@
+
+root_sources_cpp = add.cpp sub.cpp
+
+!cxx = |> g++ -Wall -Wextra -c %f -o %o |>
+!link = |> g++ %f -o %o |>
+

Modified: trunk/examples/tup/maincpp/Tupfile
===================================================================
--- trunk/examples/tup/maincpp/Tupfile	2011-03-10 15:03:17 UTC (rev 34)
+++ trunk/examples/tup/maincpp/Tupfile	2011-03-11 14:30:11 UTC (rev 35)
@@ -1,2 +1,2 @@
-
-: main.cpp |>  g++ -c %f -o %o |> %B.o
+include_rules
+: main.cpp |> !cxx |> %B.o

Modified: trunk/examples/tup/tests/Tupfile
===================================================================
--- trunk/examples/tup/tests/Tupfile	2011-03-10 15:03:17 UTC (rev 34)
+++ trunk/examples/tup/tests/Tupfile	2011-03-11 14:30:11 UTC (rev 35)
@@ -1,5 +1,5 @@
-
+include_rules
 : maintest.c00 |> cp %f %o; ../genmaintest.py %o *.cpp |> generated.maintest.cpp
-: foreach *.cpp |> g++ -c %f -o %o |> %B.o
-: *.o ../*.o |> g++ %f -o %o |> test
+: foreach *.cpp |> !cxx |> %B.o
+: *.o ../*.o |> !link |> test
 

Added: trunk/examples/tup/tests/maintest.c00
===================================================================
--- trunk/examples/tup/tests/maintest.c00	                        (rev 0)
+++ trunk/examples/tup/tests/maintest.c00	2011-03-11 14:30:11 UTC (rev 35)
@@ -0,0 +1,17 @@
+/* Generated by genmaintest.py */
+/* You MAY edit this file, but genmaintest.py will */
+/* automatically update test suite declarations and invocations. */
+/* The Simplectest site is http://simplectest.sf.net/ */
+#include "tests.h"
+#include <stdio.h>
+
+/* declarations{ */
+// to be replaced by the script
+/* }declarations */
+START_TESTS()
+printf("manually added message\n");
+/* invocations{ */
+// to be replaced by the script
+/* }invocations */
+END_TESTS()
+


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.