Permalink
Browse files

susan

  • Loading branch information...
1 parent 2a18421 commit a79fa1673ed2ec10f81acfb3eea8795bc1b43a63 Andrea Censi committed Mar 8, 2012
Showing with 91 additions and 14 deletions.
  1. +3 −3 .gitignore
  2. +48 −3 .project
  3. +2 −2 .pydevproject
  4. +10 −6 resources.yaml
  5. +5 −0 src/.gitignore
  6. +23 −0 src/Makefile
View
@@ -1,9 +1,9 @@
-src
+*egg-info
+*pyc
deploy
environment.sh
.settings
-EPD-7.1
+EPD-*
compmake-storage
-compmake_storage
*.transferred
data/roslog_test
View
@@ -16,7 +16,7 @@
</natures>
<filteredResources>
<filter>
- <id>1309710138941</id>
+ <id>1329451965557</id>
<name></name>
<type>6</type>
<matcher>
@@ -25,13 +25,58 @@
</matcher>
</filter>
<filter>
- <id>1309710138943</id>
+ <id>1329451965559</id>
<name></name>
- <type>14</type>
+ <type>30</type>
<matcher>
<id>org.eclipse.ui.ide.multiFilter</id>
<arguments>1.0-name-matches-false-false-*.egg-info</arguments>
</matcher>
</filter>
+ <filter>
+ <id>1329451965574</id>
+ <name></name>
+ <type>26</type>
+ <matcher>
+ <id>org.eclipse.ui.ide.multiFilter</id>
+ <arguments>1.0-name-matches-false-false-.git</arguments>
+ </matcher>
+ </filter>
+ <filter>
+ <id>1329451965602</id>
+ <name></name>
+ <type>6</type>
+ <matcher>
+ <id>org.eclipse.ui.ide.multiFilter</id>
+ <arguments>1.0-name-matches-false-false-*.html</arguments>
+ </matcher>
+ </filter>
+ <filter>
+ <id>1329451965604</id>
+ <name></name>
+ <type>26</type>
+ <matcher>
+ <id>org.eclipse.ui.ide.multiFilter</id>
+ <arguments>1.0-name-matches-false-false-compmake_storage</arguments>
+ </matcher>
+ </filter>
+ <filter>
+ <id>1329451965606</id>
+ <name></name>
+ <type>22</type>
+ <matcher>
+ <id>org.eclipse.ui.ide.multiFilter</id>
+ <arguments>1.0-name-matches-false-false-coverage_information</arguments>
+ </matcher>
+ </filter>
+ <filter>
+ <id>1329451965609</id>
+ <name></name>
+ <type>30</type>
+ <matcher>
+ <id>org.eclipse.ui.ide.multiFilter</id>
+ <arguments>1.0-name-matches-false-false-*cover</arguments>
+ </matcher>
+ </filter>
</filteredResources>
</projectDescription>
View
@@ -5,7 +5,6 @@
<pydev_property name="org.python.pydev.PYTHON_PROJECT_INTERPRETER">ports-py26</pydev_property>
<pydev_property name="org.python.pydev.PYTHON_PROJECT_VERSION">python 2.7</pydev_property>
<pydev_pathproperty name="org.python.pydev.PROJECT_SOURCE_PATH">
-<path>/b11/src/vehicles_dynamics/src</path>
<path>/b11/src/geometry/src</path>
<path>/b11/src/bootstrapping_olympics/src</path>
<path>/b11/src/reprep/src</path>
@@ -17,9 +16,10 @@
<path>/b11/src/conf_tools/src</path>
<path>/b11/data/bo_app1/src</path>
<path>/b11/data/bo_hidden/src</path>
-<path>/b11/src/compmake</path>
<path>/b11/src/bootstrapping_olympics/ros-packages/bootstrapping_adapter/nodes</path>
<path>/b11/src/bvapps/bo_hidden/src</path>
+<path>/b11/src/acutils/src</path>
+<path>/b11/src/compmake/src</path>
</pydev_pathproperty>
<pydev_pathproperty name="org.python.pydev.PROJECT_EXTERNAL_SOURCE_PATH">
<path>/data/work/scm/usrpyplus/lib/python2.6/site-packages</path>
View
@@ -16,12 +16,12 @@ url: git://github.com/AndreaCensi/geometry.git
---
dir: src/reprep
url: git://github.com/AndreaCensi/reprep.git
----
-dir: src/raytracer
-url: git://github.com/AndreaCensi/raytracer.git
----
-dir: src/vehicles_dynamics
-url: git@github.com:AndreaCensi/dynamics.git
+# ---
+# dir: src/raytracer
+# url: git://github.com/AndreaCensi/raytracer.git
+# ---
+# dir: src/vehicles_dynamics
+# url: git@github.com:AndreaCensi/dynamics.git
---
dir: src/vehicles
url: git@github.com:AndreaCensi/vehicles.git
@@ -43,3 +43,7 @@ url: git@github.com:AndreaCensi/bootstrapping-summer11.git
---
dir: src/boot_agents
url: git@github.com:AndreaCensi/boot_agents.git
+
+---
+dir: src/acutils
+url: git://github.com/AndreaCensi/utils.git
View
@@ -0,0 +1,5 @@
+compmake_storage"
+
+compmake_storage
+docs.mk
+pypackage.mk
View
@@ -0,0 +1,23 @@
+.PHONY: docs test test-parallel
+
+# In order of dependencies
+test-subdirs= contracts compmake geometry procgraph reprep vehicles conf_tools bootstrapping_olympics boot_agents bvapps
+
+docs-subdirs= bootstrapping_olympics compmake geometry procgraph reprep vehicles contracts
+#boot_agents
+# conf_tools
+
+test: $(foreach subdir, $(test-subdirs), test-$(subdir))
+test-parallel: $(foreach subdir, $(test-subdirs), testp-$(subdir))
+docs: $(foreach subdir, $(docs-subdirs), docs-$(subdir))
+
+
+test-%:
+ $(MAKE) -C $* test
+
+testp-%:
+ $(MAKE) -C $* test-parallel
+
+docs-%:
+ $(MAKE) -C $* docs
+

0 comments on commit a79fa16

Please sign in to comment.