now using differentiated share-jevois and share-jevoispro

Author: jevois

CMakeLists.txt

@@ -68,8 +68,8 @@ jevois_setup_modules(src/Modules "")
 target_link_libraries(SampleModule ${JEVOIS_OPENCV_LIBS} opencv_imgproc opencv_core)
 
 ## Install any shared resources (cascade classifiers, neural network weights, etc) in the share/ sub-directory:
-install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/share"
-  DESTINATION "${JEVOIS_MODULES_ROOT}" COMPONENT bin)
+install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/share-${JEVOIS}/"
+  DESTINATION "${JEVOIS_MODULES_ROOT}/share" COMPONENT bin)
 
 ########################################################################################################################
 # Debian packaging:

rebuild-host.sh

@@ -1,12 +1,8 @@
 #!/bin/sh
 
-# On ARM hosts like Raspberry Pi3, we will likely run out of memory if attempting more than 1 compilation thread:
-ncpu=`cat /proc/cpuinfo |grep processor|wc -l`
-if [ `cat /proc/cpuinfo | grep ARM | wc -l` -gt 0 ]; then ncpu=1; fi
-
 /bin/rm -rf hbuild \
     && mkdir hbuild \
     && cd hbuild \
     && cmake "$@" .. \
-    && make -j ${ncpu} \
+    && make -j \
     && sudo make install

rebuild-platform.sh

@@ -12,14 +12,10 @@ if [ "X$1" = "X--staging" ]; then extra="-DJEVOIS_MODULES_TO_STAGING=ON"; shift;
 if [ "X$1" = "X--microsd" ]; then extra="-DJEVOIS_MODULES_TO_MICROSD=ON"; shift; fi
 if [ "X$1" = "X--live" ]; then extra="-DJEVOIS_MODULES_TO_LIVE=ON"; shift; fi
 
-# On ARM hosts like Raspberry Pi3, we will likely run out of memory if attempting more than 1 compilation thread:
-ncpu=`cat /proc/cpuinfo |grep processor|wc -l`
-if [ `cat /proc/cpuinfo | grep ARM | wc -l` -gt 0 ]; then ncpu=1; fi
-
 sudo /bin/rm -rf pbuild \
     && mkdir pbuild \
     && cd pbuild \
     && cmake "${extra} $@" -DJEVOIS_PLATFORM=ON .. \
-    && make -j ${ncpu} \
+    && make -j \
     && sudo make install
 

rebuild-pro-host.sh

@@ -1,13 +1,9 @@
 #!/bin/sh
 
-# On JeVoisPro, limit the number of compile threads to not run out of memory:
-ncpu=`grep -c processor /proc/cpuinfo`
-if [ `grep -c JeVois /proc/cpuinfo` -gt 0 ]; then ncpu=4; fi
-
 # Build everything:
 sudo /bin/rm -rf phbuild \
     && mkdir phbuild \
     && cd phbuild \
     && cmake "$@" -DJEVOIS_HARDWARE=PRO .. \
-    && make -j ${ncpu} \
+    && make -j \
     && sudo make install

rebuild-pro-platform-pdeb.sh

@@ -1,16 +1,12 @@
 #!/bin/bash
 # USAGE: rebuild-pro-platform-pdeb.sh [cmake opts]
 
-# On JeVoisPro, limit the number of compile threads to not run out of memory:
-ncpu=`grep -c processor /proc/cpuinfo`
-if [ `grep -c JeVois /proc/cpuinfo` -gt 0 ]; then ncpu=4; fi
-
 # Let's build it:
 sudo /bin/rm -rf ppdbuild \
     && mkdir ppdbuild \
     && cd ppdbuild \
     && cmake -DJEVOIS_HARDWARE=PRO -DJEVOIS_PLATFORM=ON -DJEVOIS_MODULES_TO_STAGING=ON -DJEVOISPRO_PLATFORM_DEB=ON $@ .. \
-    && make -j ${ncpu} \
+    && make -j \
     && sudo make install \
     && sudo cpack
 

rebuild-pro-platform.sh

@@ -0,0 +1,12 @@
+#!/bin/bash
+# USAGE: rebuild-pro-platform-pdeb.sh [cmake opts]
+
+# Let's build it:
+sudo /bin/rm -rf ppdbuild \
+    && mkdir ppdbuild \
+    && cd ppdbuild \
+    && cmake -DJEVOIS_HARDWARE=PRO -DJEVOIS_PLATFORM=ON -DJEVOIS_MODULES_TO_STAGING=ON $@ .. \
+    && make -j \
+    && sudo make install \
+    && sudo cpack
+