dev3

MarcToussaint · Sep 22, 2024 · 79d80ab · 79d80ab
1 parent 3823659
commit 79d80ab
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 7 deletions.
diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml
@@ -18,7 +18,7 @@ jobs:
         python-version: '3.10'
     - name: install ubuntu dependencies
       run: |
-        sudo apt-get install libboost-system-dev
+        sudo apt-get install libboost-system-dev libjsoncpp-dev
         APTGETYES=1 make -C rai -j1 installUbuntuAll
     - name: install source dependencies
       run: |

diff --git a/Makefile b/Makefile
@@ -1,7 +1,10 @@
 PY_VER = $(shell python3 -c "import sys; print(str(sys.version_info[0])+'.'+str(sys.version_info[1]))")
 PY_SITE = $(shell python3 -m site --user-site)
 
-default: docs
+default: compile
+
+compile:
+	make -C build
 
 docs:
 	cd rai-docs && sphinx-build doc ../html
@@ -18,6 +21,7 @@ local-install:
 
 local-clean:
 	-rm -Rf $(PY_SITE)/robotic
+	-rm -Rf $(PY_SITE)/robotic-*
 	-rm -f ${HOME}/.local/lib/*rai*
 	-rm -f ${HOME}/.local/bin/*ry*
 
@@ -38,6 +42,9 @@ test:
 	cd ${HOME} && python3 -c 'import robotic as ry; print("ry version:", ry.__version__, ry.compiled());'
 
 test2:
+	cd ${HOME} && python3 -c 'import robotic as ry; ry.test.RndScene()'
+
+test3:
 	ry-view $(PY_SITE)/robotic/rai-robotModels/scenarios/pandasTable.g
 
 test-tutorials:

diff --git a/botop b/botop
diff --git a/rai b/rai
diff --git a/rai-robotModels b/rai-robotModels
diff --git a/rai-tutorials b/rai-tutorials
diff --git a/robotic/version.py b/robotic/version.py
@@ -1 +1 @@
-__version__ = '0.2.0.dev2'
+__version__ = '0.2.0.dev3'