Use CATKIN_IGNORE for demo packages

asherikov · Jan 3, 2025 · a51f4a0 · a51f4a0
1 parent 2b5878a
commit a51f4a0
Show file tree

Hide file tree

Showing 7 changed files with 5 additions and 5 deletions.
diff --git a/.github/workflows/ws_2.yml b/.github/workflows/ws_2.yml
@@ -45,7 +45,7 @@ jobs:
             - uses: actions/checkout@v4
               with:
                 path: src/ariles_ws
-            - run: cd src/ariles_ws/demo/plain/ && mv package.xml.disable package.xml
+            - run: rm src/ariles_ws/demo/plain/CATKIN_IGNORE
             - run: make bp_install_build BUILD_PROFILE=reldebug
             - run: make dep_install PKG=ariles2_plain_demo
             - run: make ariles2_plain_demo
@@ -61,7 +61,7 @@ jobs:
             - uses: actions/checkout@v4
               with:
                 path: src/ariles_ws
-            - run: cd src/ariles_ws/demo/plain/ && mv package.xml.disable package.xml
+            - run: rm src/ariles_ws/demo/plain/CATKIN_IGNORE
             - run: make bp_install_build BUILD_PROFILE=reldebug
             - run: make dep_install PKG=ariles2_plain_demo
             - run: make ariles2_plain_demo

diff --git a/.make/ros.mk b/.make/ros.mk
@@ -105,7 +105,7 @@ catkin_old_deb: catkin_prepare_workspace
 	${MAKE} catkin_test_deb
 	${MAKE} catkin_prepare_workspace
 	cd ${CATKIN_PKGS_PATH}/; ls -1A | grep -v demo | xargs rm -Rf
-	cd ${CATKIN_PKGS_PATH}/demo/catkin; mv package.xml.disable package.xml
+	rm ${CATKIN_PKGS_PATH}/demo/catkin/CATKIN_IGNORE
 	cd ${CATKIN_WORKING_DIR}/src; catkin_init_workspace
 	cd ${CATKIN_WORKING_DIR}; catkin_make_isolated --pkg ${CATKIN_DEPENDENCY_TEST_PKG}
 	sudo ${MAKE} clean_deb clean_rosdep
@@ -116,15 +116,15 @@ catkin_new_build: catkin_prepare_workspace
 	cd ${CATKIN_WORKING_DIR}; catkin build -i --verbose --summary ${WS_PKGS} --make-args ${CATKIN_TARGETS} ${CATKIN_ARGS}
 
 catkin_new_build_with_dependent: catkin_prepare_workspace
-	cd ${CATKIN_PKGS_PATH}/demo/catkin; mv package.xml.disable package.xml
+	rm ${CATKIN_PKGS_PATH}/demo/catkin/CATKIN_IGNORE
 	cd ${CATKIN_WORKING_DIR}; catkin init
 	cd ${CATKIN_WORKING_DIR}; catkin build -i --verbose --summary ${CATKIN_DEPENDENCY_TEST_PKG}
 
 catkin_new_deb:
 	${MAKE} catkin_test_deb
 	${MAKE} catkin_prepare_workspace
 	cd ${CATKIN_PKGS_PATH}; ls -1A | grep -v demo | xargs rm -Rf
-	cd ${CATKIN_PKGS_PATH}/demo/catkin; mv package.xml.disable package.xml
+	rm ${CATKIN_PKGS_PATH}/demo/catkin/CATKIN_IGNORE
 	cd ${CATKIN_WORKING_DIR}; catkin init
 	cd ${CATKIN_WORKING_DIR}; catkin build -i --verbose --summary ${CATKIN_DEPENDENCY_TEST_PKG}
 	sudo ${MAKE} clean_deb

diff --git a/demo/catkin/CATKIN_IGNORE b/demo/catkin/CATKIN_IGNORE
diff --git a/demo/catkin/package.xml.disable → demo/catkin/package.xml b/demo/catkin/package.xml.disable → demo/catkin/package.xml
diff --git a/demo/plain/CATKIN_IGNORE b/demo/plain/CATKIN_IGNORE
diff --git a/demo/plain/package.xml.disable → demo/plain/package.xml b/demo/plain/package.xml.disable → demo/plain/package.xml
diff --git a/demo/plain_ros1/CATKIN_IGNORE b/demo/plain_ros1/CATKIN_IGNORE