Renamed build_library scripts to install_bin2cpp.

end2endzone · Apr 25, 2021 · 5d7701c · 5d7701c
1 parent ccefc61
commit 5d7701c
Show file tree

Hide file tree

Showing 17 changed files with 12 additions and 12 deletions.
diff --git a/.github/workflows/build_linux.yml b/.github/workflows/build_linux.yml
@@ -68,7 +68,7 @@ jobs:
     - name: Build bin2cpp
       working-directory: ${{env.GITHUB_WORKSPACE}}
       shell: bash
-      run: ./ci/github/build_library.sh
+      run: ./ci/github/install_bin2cpp.sh
 
     - name: Run unit tests
       working-directory: ${{env.GITHUB_WORKSPACE}}

diff --git a/.github/workflows/build_macos.yml b/.github/workflows/build_macos.yml
@@ -68,7 +68,7 @@ jobs:
     - name: Build bin2cpp
       working-directory: ${{env.GITHUB_WORKSPACE}}
       shell: bash
-      run: ./ci/github/build_library.sh
+      run: ./ci/github/install_bin2cpp.sh
 
     - name: Run unit tests
       working-directory: ${{env.GITHUB_WORKSPACE}}

diff --git a/.github/workflows/build_windows.yml b/.github/workflows/build_windows.yml
@@ -70,7 +70,7 @@ jobs:
     - name: Build bin2cpp
       working-directory: ${{env.GITHUB_WORKSPACE}}
       shell: cmd
-      run: call ci\github\build_library.bat
+      run: call ci\github\install_bin2cpp.bat
 
     - name: Run unit tests
       working-directory: ${{env.GITHUB_WORKSPACE}}

diff --git a/.travis.yml b/.travis.yml
@@ -15,7 +15,7 @@ install:
 - cd $TRAVIS_BUILD_DIR/ci/travis; ./install_rapidassist.sh;
 
 script:
-- cd $TRAVIS_BUILD_DIR/ci/travis; ./build_library.sh;
+- cd $TRAVIS_BUILD_DIR/ci/travis; ./install_bin2cpp.sh;
 
 after_success:
 - cd $TRAVIS_BUILD_DIR/ci/travis; ./test_script.sh;

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -77,7 +77,7 @@ set(BIN2CPP_BUILD_TYPE_CPP_DEFINE)
 set(BIN2CPP_INSTALL_BIN_DIR      "bin")
 set(BIN2CPP_INSTALL_LIB_DIR      "lib/bin2cpp-${BIN2CPP_VERSION}")
 set(BIN2CPP_INSTALL_INCLUDE_DIR  "include/bin2cpp-${BIN2CPP_VERSION}")
-set(BIN2CPP_INSTALL_CMAKE_DIR    ${BIN2CPP_INSTALL_LIB_DIR}) # CMake files (*.cmake) should have the same destination as the library files. Some also prefers to use "cmake".
+set(BIN2CPP_INSTALL_CMAKE_DIR    "cmake/bin2cpp-${BIN2CPP_VERSION}") # CMake files (*.cmake) should have the same destination as the library files. Some also prefers to use "cmake".
 
 ##############################################################################################################################################
 # Project settings

diff --git a/INSTALL.md b/INSTALL.md
@@ -88,7 +88,7 @@ If you do not know about *debug* and *release* configurations, then you probably
 **Launch one of the 2 scripts to fully build bin2cpp with all dependencies using default options.**
 
 Also, there are other scripts which are designed to be called by the 2 master scripts:
-* build_library.sh
+* install_bin2cpp.sh
 * install_googletest.sh
 * install_rapidassist.sh
 * test_script.sh
@@ -123,7 +123,7 @@ If you do not know about *debug* and *release* configurations, then you probably
 **Double click on one of the 2 scripts to fully build RapidAssist with all dependencies using default options.**
 
 Also, there are other scripts which are designed to be called by the 2 master scripts:
-* build_library.bat
+* install_bin2cpp.bat
 * install_googletest.bat
 * install_rapidassist.bat
 * test_script.bat

diff --git a/appveyor.yml b/appveyor.yml
@@ -64,7 +64,7 @@ before_build:
 - cmd: call %APPVEYOR_BUILD_FOLDER%\ci\appveyor\install_rapidassist.bat
 
 build_script:
-- cmd: call %APPVEYOR_BUILD_FOLDER%\ci\appveyor\build_library.bat
+- cmd: call %APPVEYOR_BUILD_FOLDER%\ci\appveyor\install_bin2cpp.bat
 
 #---------------------------------#
 #       tests configuration       #

diff --git a/ci/appveyor/build_library.bat → ci/appveyor/install_bin2cpp.bat b/ci/appveyor/build_library.bat → ci/appveyor/install_bin2cpp.bat
diff --git a/ci/github/build_library.bat → ci/github/install_bin2cpp.bat b/ci/github/build_library.bat → ci/github/install_bin2cpp.bat
diff --git a/ci/github/build_library.sh → ci/github/install_bin2cpp.sh b/ci/github/build_library.sh → ci/github/install_bin2cpp.sh
diff --git a/ci/linux/build_all_debug.sh b/ci/linux/build_all_debug.sh
@@ -19,5 +19,5 @@ echo "BIN2CPP_BUILD_TYPE set to '$BIN2CPP_BUILD_TYPE'."
 # Call all build scripts one by one.
 cd "$BIN2CPP_SOURCE_DIR/ci/linux" && ./install_googletest.sh;
 cd "$BIN2CPP_SOURCE_DIR/ci/linux" && ./install_rapidassist.sh;
-cd "$BIN2CPP_SOURCE_DIR/ci/linux" && ./build_library.sh;
+cd "$BIN2CPP_SOURCE_DIR/ci/linux" && ./install_bin2cpp.sh;
 cd "$BIN2CPP_SOURCE_DIR/ci/linux" && ./test_script.sh;
diff --git a/ci/linux/build_all_release.sh b/ci/linux/build_all_release.sh
@@ -19,5 +19,5 @@ echo "BIN2CPP_BUILD_TYPE set to '$BIN2CPP_BUILD_TYPE'."
 # Call all build scripts one by one.
 cd "$BIN2CPP_SOURCE_DIR/ci/linux" && ./install_googletest.sh;
 cd "$BIN2CPP_SOURCE_DIR/ci/linux" && ./install_rapidassist.sh;
-cd "$BIN2CPP_SOURCE_DIR/ci/linux" && ./build_library.sh;
+cd "$BIN2CPP_SOURCE_DIR/ci/linux" && ./install_bin2cpp.sh;
 cd "$BIN2CPP_SOURCE_DIR/ci/linux" && ./test_script.sh;
diff --git a/ci/linux/build_library.sh → ci/linux/install_bin2cpp.sh b/ci/linux/build_library.sh → ci/linux/install_bin2cpp.sh
diff --git a/ci/travis/build_library.sh → ci/travis/install_bin2cpp.sh b/ci/travis/build_library.sh → ci/travis/install_bin2cpp.sh
diff --git a/ci/windows/build_all_debug.bat b/ci/windows/build_all_debug.bat
@@ -27,7 +27,7 @@ call "%BIN2CPP_SOURCE_DIR%\ci\windows\install_googletest.bat"
 if %errorlevel% neq 0 pause && exit /b %errorlevel%
 call "%BIN2CPP_SOURCE_DIR%\ci\windows\install_rapidassist.bat"
 if %errorlevel% neq 0 pause && exit /b %errorlevel%
-call "%BIN2CPP_SOURCE_DIR%\ci\windows\build_library.bat"
+call "%BIN2CPP_SOURCE_DIR%\ci\windows\install_bin2cpp.bat"
 if %errorlevel% neq 0 pause && exit /b %errorlevel%
 call "%BIN2CPP_SOURCE_DIR%\ci\windows\test_script.bat"
 if %errorlevel% neq 0 pause && exit /b %errorlevel%

diff --git a/ci/windows/build_all_release.bat b/ci/windows/build_all_release.bat
@@ -27,7 +27,7 @@ call "%BIN2CPP_SOURCE_DIR%\ci\windows\install_googletest.bat"
 if %errorlevel% neq 0 pause && exit /b %errorlevel%
 call "%BIN2CPP_SOURCE_DIR%\ci\windows\install_rapidassist.bat"
 if %errorlevel% neq 0 pause && exit /b %errorlevel%
-call "%BIN2CPP_SOURCE_DIR%\ci\windows\build_library.bat"
+call "%BIN2CPP_SOURCE_DIR%\ci\windows\install_bin2cpp.bat"
 if %errorlevel% neq 0 pause && exit /b %errorlevel%
 call "%BIN2CPP_SOURCE_DIR%\ci\windows\test_script.bat"
 if %errorlevel% neq 0 pause && exit /b %errorlevel%

diff --git a/ci/windows/build_library.bat → ci/windows/install_bin2cpp.bat b/ci/windows/build_library.bat → ci/windows/install_bin2cpp.bat