Merge pull request #22 from RonaldsonBellande/main

latest pushes
Application-Interoperability-Xenogen · Aug 5, 2023 · 6dd72fb · 6dd72fb
2 parents 2e3819d + 2377fcb
commit 6dd72fb
Show file tree

Hide file tree

Showing 18 changed files with 39 additions and 39 deletions.
diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml
@@ -2,9 +2,9 @@ name: Docker Image CI
 
 on:
   push:
-    branches: [ "noetic" ]
+    branches: [ "main" ]
   pull_request:
-    branches: [ "noetic" ]
+    branches: [ "main" ]
 
 jobs:
 

diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml
@@ -9,11 +9,11 @@ on:
   schedule:
     - cron: '36 5 * * *'
   push:
-    branches: [ "noetic" ]
+    branches: [ "main" ]
     # Publish semver tags as releases.
     tags: [ 'v*.*.*' ]
   pull_request:
-    branches: [ "noetic" ]
+    branches: [ "main" ]
 
 env:
   # Use docker.io for Docker Hub if empty

diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
@@ -5,9 +5,9 @@ name: Java CI with Maven
 
 on:
   push:
-    branches: [ noetic ]
+    branches: [ main ]
   pull_request:
-    branches: [ noetic ]
+    branches: [ main ]
 
 jobs:
   build:

diff --git a/.github/workflows/pages.yml b/.github/workflows/pages.yml
@@ -4,7 +4,7 @@ name: Deploy Jekyll with GitHub Pages dependencies preinstalled
 on:
   # Runs on pushes targeting the default branch
   push:
-    branches: ["noetic"]
+    branches: ["main"]
 
   # Allows you to run this workflow manually from the Actions tab
   workflow_dispatch:

diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -4,7 +4,7 @@ Changelog for package genmobile
 
 0.4.0 (2022-05-19)
 ------------------
-* Update package.xml, CMakeList.txt for noetic branch
+* Update package.xml, CMakeList.txt for main branch
 * Update gradle and wapper to be up-to-date
 * Fix Bugs that has to do with the gradle building
 * Release version in github for easy access when building project

diff --git a/CMakeCache.txt b/CMakeCache.txt
@@ -383,16 +383,16 @@ _gtest_INCLUDES:FILEPATH=/usr/include/gtest/gtest.h
 _gtest_SOURCES:FILEPATH=/usr/src/gtest/src/gtest.cc
 
 //The directory containing a CMake configuration file for catkin.
-catkin_DIR:PATH=/opt/ros/noetic/share/catkin/cmake
+catkin_DIR:PATH=/opt/ros/main/share/catkin/cmake
 
 //The directory containing a CMake configuration file for gencpp.
-gencpp_DIR:PATH=/opt/ros/noetic/share/gencpp/cmake
+gencpp_DIR:PATH=/opt/ros/main/share/gencpp/cmake
 
 //The directory containing a CMake configuration file for geneus.
-geneus_DIR:PATH=/opt/ros/noetic/share/geneus/cmake
+geneus_DIR:PATH=/opt/ros/main/share/geneus/cmake
 
 //The directory containing a CMake configuration file for genlisp.
-genlisp_DIR:PATH=/opt/ros/noetic/share/genlisp/cmake
+genlisp_DIR:PATH=/opt/ros/main/share/genlisp/cmake
 
 //Value Computed by CMake
 genmobile_BINARY_DIR:STATIC=/home/ronaldsonbellande-hplaptop/Desktop/User_Interface_Experience/genmobile
@@ -401,13 +401,13 @@ genmobile_BINARY_DIR:STATIC=/home/ronaldsonbellande-hplaptop/Desktop/User_Interf
 genmobile_SOURCE_DIR:STATIC=/home/ronaldsonbellande-hplaptop/Desktop/User_Interface_Experience/genmobile
 
 //The directory containing a CMake configuration file for genmsg.
-genmsg_DIR:PATH=/opt/ros/noetic/share/genmsg/cmake
+genmsg_DIR:PATH=/opt/ros/main/share/genmsg/cmake
 
 //The directory containing a CMake configuration file for gennodejs.
-gennodejs_DIR:PATH=/opt/ros/noetic/share/gennodejs/cmake
+gennodejs_DIR:PATH=/opt/ros/main/share/gennodejs/cmake
 
 //The directory containing a CMake configuration file for genpy.
-genpy_DIR:PATH=/opt/ros/noetic/share/genpy/cmake
+genpy_DIR:PATH=/opt/ros/main/share/genpy/cmake
 
 //Value Computed by CMake
 gmock_BINARY_DIR:STATIC=/home/ronaldsonbellande-hplaptop/Desktop/User_Interface_Experience/genmobile/gtest/googlemock

diff --git a/CMakeFiles/clean_test_results.dir/build.make b/CMakeFiles/clean_test_results.dir/build.make
@@ -54,7 +54,7 @@ CMAKE_BINARY_DIR = /home/ronaldsonbellande-hplaptop/Desktop/User_Interface_Exper
 include CMakeFiles/clean_test_results.dir/progress.make
 
 CMakeFiles/clean_test_results:
-	/usr/bin/python3 /opt/ros/noetic/share/catkin/cmake/test/remove_test_results.py /home/ronaldsonbellande-hplaptop/Desktop/User_Interface_Experience/genmobile/test_results
+	/usr/bin/python3 /opt/ros/main/share/catkin/cmake/test/remove_test_results.py /home/ronaldsonbellande-hplaptop/Desktop/User_Interface_Experience/genmobile/test_results
 
 clean_test_results: CMakeFiles/clean_test_results
 clean_test_results: CMakeFiles/clean_test_results.dir/build.make

diff --git a/README.md b/README.md
@@ -28,11 +28,11 @@ are not trying  to replace existing more so displaying useful information to the
 
 * It is a direct dependency for rosmobile/android
 * It is a popular and stable dependency that will require little maintenance
-* Latest versions are on Application-UI-UX and it is noetic
+* Latest versions are on Application-UI-UX and it is main
 
 Then to actually add the dependency:
 
-* new release versions are noetic
+* new release versions are main
 * add the message dependency to package.xml
 * add the message dependency to CMakeLists.txt
 * create a pull request

diff --git a/catkin_generated/generate_cached_setup.py b/catkin_generated/generate_cached_setup.py
@@ -6,8 +6,8 @@
 import sys
 
 # find the import for catkin's python package - either from source space or from an installed underlay
-if os.path.exists(os.path.join('/opt/ros/noetic/share/catkin/cmake', 'catkinConfig.cmake.in')):
-    sys.path.insert(0, os.path.join('/opt/ros/noetic/share/catkin/cmake', '..', 'python'))
+if os.path.exists(os.path.join('/opt/ros/main/share/catkin/cmake', 'catkinConfig.cmake.in')):
+    sys.path.insert(0, os.path.join('/opt/ros/main/share/catkin/cmake', '..', 'python'))
 try:
     from catkin.environment_cache import generate_environment_script
 except ImportError:

diff --git a/catkin_generated/installspace/genmobileConfig.cmake b/catkin_generated/installspace/genmobileConfig.cmake
@@ -154,7 +154,7 @@ foreach(library ${libraries})
     set(lib_path "")
     set(lib "${library}-NOTFOUND")
     # since the path where the library is found is returned we have to iterate over the paths manually
-    foreach(path /usr/local/lib;/opt/ros/noetic/lib)
+    foreach(path /usr/local/lib;/opt/ros/main/lib)
       find_library(lib ${library}
         PATHS ${path}
         NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH)

diff --git a/catkin_generated/stamps/genmobile/genmobile/_setup_util.py.stamp b/catkin_generated/stamps/genmobile/genmobile/_setup_util.py.stamp
@@ -268,7 +268,7 @@ if __name__ == '__main__':
 
         if not args.local:
             # environment at generation time
-            CMAKE_PREFIX_PATH = r'/opt/ros/noetic'.split(';')
+            CMAKE_PREFIX_PATH = r'/opt/ros/main'.split(';')
         else:
             # don't consider any other prefix path than this one
             CMAKE_PREFIX_PATH = []

diff --git a/docker/Dockerfile b/docker/Dockerfile
@@ -58,15 +58,15 @@ RUN mkdir -p $CATKIN_WS/src
 WORKDIR $CATKIN_WS/src
 
 # Initialize local catkin workspace, install dependencies and build workpsace
-RUN echo "source /opt/ros/noetic/setup.bash" >> ~/.bashrc
+RUN echo "source /opt/ros/main/setup.bash" >> ~/.bashrc
 RUN source ~/.bashrc
 
 RUN cd $CATKIN_WS \
   && rosdep init \
   && rosdep update \
-  && rosdep update --rosdistro noetic \
+  && rosdep update --rosdistro main \
   && rosdep fix-permissions \
-  && rosdep install -y --from-paths . --ignore-src --rosdistro noetic
+  && rosdep install -y --from-paths . --ignore-src --rosdistro main
 
 RUN ln -s /studio-data/profile/AndroidStudio$ANDROID_STUDIO_VERSION .AndroidStudio$ANDROID_STUDIO_VERSION
 RUN ln -s /studio-data/Android Android

diff --git a/docker/gpu.Dockerfile b/docker/gpu.Dockerfile
@@ -63,15 +63,15 @@ RUN mkdir -p $CATKIN_WS/src
 WORKDIR $CATKIN_WS/src
 
 # Initialize local catkin workspace, install dependencies and build workpsace
-RUN echo "source /opt/ros/noetic/setup.bash" >> ~/.bashrc
+RUN echo "source /opt/ros/main/setup.bash" >> ~/.bashrc
 RUN source ~/.bashrc
 
 RUN cd $CATKIN_WS \
   && rosdep init \
   && rosdep update \
-  && rosdep update --rosdistro noetic \
+  && rosdep update --rosdistro main \
   && rosdep fix-permissions \
-  && rosdep install -y --from-paths . --ignore-src --rosdistro noetic
+  && rosdep install -y --from-paths . --ignore-src --rosdistro main
 
 RUN ln -s /studio-data/profile/AndroidStudio$ANDROID_STUDIO_VERSION .AndroidStudio$ANDROID_STUDIO_VERSION
 RUN ln -s /studio-data/Android Android

diff --git a/requirements/ros_requirements.txt b/requirements/ros_requirements.txt
@@ -1,15 +1,15 @@
 # Recomandation for dependencies for ros system
 
-ros-noetic-desktop-full
+ros-main-desktop-full
 build-essential
-ros-noetic-catkin
+ros-main-catkin
 python-rosdep
 python-rosinstall
 python-rosinstall-generator
 python-wstool
 python-catkin-tools
-ros-noetic-pcl-ros
-ros-noetic-flexbe-behavior-engine
-ros-noetic-moveit
-ros-noetic-gazebo-ros-pkgs 
-ros-noetic-gazebo-ros-control
+ros-main-pcl-ros
+ros-main-flexbe-behavior-engine
+ros-main-moveit
+ros-main-gazebo-ros-pkgs 
+ros-main-gazebo-ros-control
diff --git a/target/site/index_BACKUP_12837.html b/target/site/index_BACKUP_12837.html
@@ -64,7 +64,7 @@ <h5>Project Documentation</h5>
       <div id="contentBox">
 <div class="section">
 <h2><a name="About_genmobile"></a>About genmobile</h2><a name="About_genmobile"></a>
-  <p><zero-md src="https://raw.githubusercontent.com/Application-UI-UX/genmobile/noetic/README.md"></zero-md></p>        
+  <p><zero-md src="https://raw.githubusercontent.com/Application-UI-UX/genmobile/main/README.md"></zero-md></p>        
         </div>
       </div>
     </div>

diff --git a/target/site/index_BACKUP_12921.html b/target/site/index_BACKUP_12921.html
@@ -64,7 +64,7 @@ <h5>Project Documentation</h5>
       <div id="contentBox">
 <div class="section">
 <h2><a name="About_genmobile"></a>About genmobile</h2><a name="About_genmobile"></a>
-  <p><zero-md src="https://raw.githubusercontent.com/Application-UI-UX/genmobile/noetic/README.md"></zero-md></p>        
+  <p><zero-md src="https://raw.githubusercontent.com/Application-UI-UX/genmobile/main/README.md"></zero-md></p>        
         </div>
       </div>
     </div>

diff --git a/target/site/index_REMOTE_12837.html b/target/site/index_REMOTE_12837.html
@@ -60,7 +60,7 @@ <h5>Project Documentation</h5>
       <div id="contentBox">
 <div class="section">
 <h2><a name="About_genmobile"></a>About genmobile</h2><a name="About_genmobile"></a>
-  <p><zero-md src="https://raw.githubusercontent.com/Application-UI-UX/genmobile/noetic/README.md"></zero-md></p>        
+  <p><zero-md src="https://raw.githubusercontent.com/Application-UI-UX/genmobile/main/README.md"></zero-md></p>        
         </div>
       </div>
     </div>

diff --git a/target/site/index_REMOTE_12921.html b/target/site/index_REMOTE_12921.html
@@ -60,7 +60,7 @@ <h5>Project Documentation</h5>
       <div id="contentBox">
 <div class="section">
 <h2><a name="About_genmobile"></a>About genmobile</h2><a name="About_genmobile"></a>
-  <p><zero-md src="https://raw.githubusercontent.com/Application-UI-UX/genmobile/noetic/README.md"></zero-md></p>        
+  <p><zero-md src="https://raw.githubusercontent.com/Application-UI-UX/genmobile/main/README.md"></zero-md></p>        
         </div>
       </div>
     </div>