Rename CMake targets

Author: marcauberer

.github/workflows/ci-cpp.yml

@@ -26,7 +26,7 @@ jobs:
         run: |
           mkdir -p ./lib/json
           cd lib
-          git clone https://github.com/google/googletest.git
+          git clone --depth 1 --branch v1.13.0 https://github.com/google/googletest.git
           curl -sSL "https://github.com/nlohmann/json/releases/download/v3.11.2/json.hpp" --output json/json.hpp
 
       - name: Build project

.github/workflows/publish.yml

@@ -24,7 +24,7 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v3
-      
+
       - name: Prepare builder
         run: |
           docker run --rm dockcross/${{ matrix.arch_name }} > ./dockcross
@@ -37,7 +37,7 @@ jobs:
           cd ./compiler/cpp/lib
           git clone --depth 1 --branch release-1.12.1 https://github.com/google/googletest.git
           curl -sSL https://github.com/nlohmann/json/releases/download/v3.11.2/json.hpp --output json/json.hpp
-      
+
       - name: Configure
         run: ./dockcross cmake -Bbin -H./compiler/cpp -GNinja
 
@@ -47,14 +47,7 @@ jobs:
       - name: Process build output - Linux
         if: ${{ startsWith(matrix.arch_name, 'linux') }}
         working-directory: bin
-        run: |
-          mv ./src/CCom_run ccomc
-          chmod +x ccomc
-          
-      - name: Process build output - Windows
-        if: ${{ startsWith(matrix.arch_name, 'windows') }}
-        working-directory: bin
-        run: mv ./src/CCom_run.exe ccomc.exe
+        run: chmod +x ccomc
 
       - name: Upload artifact
         uses: actions/upload-artifact@v3
@@ -77,7 +70,7 @@ jobs:
 
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v2
-        
+
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v2
 
@@ -186,11 +179,11 @@ jobs:
           curl -sSf -u "${{ secrets.NEXUS_USERNAME }}:${{ secrets.NEXUS_PASSWORD }}" -H "Content-Type: multipart/form-data" --data-binary "@./ccom_${{ matrix.arch }}.deb" "${{ secrets.NEXUS_URL }}/ubuntu-xenial/"
           curl -sSf -u "${{ secrets.NEXUS_USERNAME }}:${{ secrets.NEXUS_PASSWORD }}" -H "Content-Type: multipart/form-data" --data-binary "@./ccom_${{ matrix.arch }}.deb" "${{ secrets.NEXUS_URL }}/ubuntu-trusty/"
           curl -sSf -u "${{ secrets.NEXUS_USERNAME }}:${{ secrets.NEXUS_PASSWORD }}" -H "Content-Type: multipart/form-data" --data-binary "@./ccom_${{ matrix.arch }}.deb" "${{ secrets.NEXUS_URL }}/ubuntu-jammy/"
-      
+
       - name: Deploy to CentOS repo
         run: |
           curl -sSf -u "${{ secrets.NEXUS_USERNAME }}:${{ secrets.NEXUS_PASSWORD }}" -H "Content-Type: multipart/form-data" --upload-file ./ccom_${{ matrix.arch }}.rpm ${{ secrets.NEXUS_URL }}/centos/ccom/${{ steps.get_version.outputs.version }}/compose-generator-${{ matrix.arch }}.rpm
-      
+
       - name: Deploy to Fedora repo
         run: |
           curl -sSf -u "${{ secrets.NEXUS_USERNAME }}:${{ secrets.NEXUS_PASSWORD }}" -H "Content-Type: multipart/form-data" --upload-file ./ccom_${{ matrix.arch }}.rpm ${{ secrets.NEXUS_URL }}/fedora/ccom/${{ steps.get_version.outputs.version }}/compose-generator-${{ matrix.arch }}.rpm
@@ -261,25 +254,16 @@ jobs:
           asset_name: ccom_${{ matrix.config.label }}_setup.msi
           tag: ${{ github.ref }}
 
-
-      - uses: vedantmgoyal2009/winget-releaser@v1
-        with:
-          identifier: ChilliBits.CCom
-          version: ${{ github.ref_name }}
-          release-tag: ${{ github.ref_name }}
-          token: ${{ secrets.CR_PAT }}
-
   deploy-win-installers:
     name: Deploy installers
     if: startsWith(github.ref, 'refs/tags/')
     needs: build-win-installers
     runs-on: windows-latest
 
     steps:
-      - uses: vedantmgoyal2009/winget-releaser@v1
+      - uses: vedantmgoyal2009/winget-releaser@v2
         with:
           identifier: ChilliBits.CCom
           version: ${{ github.ref }}
           release-tag: ${{ github.ref }}
-          token: ${{ secrets.CR_PAT }}
-
+          token: ${{ secrets.CR_PAT }}

build.bat

@@ -10,6 +10,4 @@ cd ../bin
 cmake -DCMAKE_BUILD_TYPE=Release -G "CodeBlocks - MinGW Makefiles" ../compiler/cpp
 mingw32-make
 
-move src\CCom_run.exe ccomc.exe
-
 cd ..

build.sh

@@ -9,6 +9,4 @@ cd ../bin
 cmake -DCMAKE_BUILD_TYPE=Release ../compiler/cpp
 make
 
-mv ./src/CCom_run ./ccomc
-
 cd ..

compiler/cpp/.run/CCom_run.run.xml

@@ -7,12 +7,4 @@
       <option name="com.jetbrains.cidr.execution.CidrBuildBeforeRunTaskProvider$BuildBeforeRunTask" enabled="true" />
     </method>
   </configuration>
-  <configuration default="false" name="CCom_test" type="CMakeRunConfiguration" factoryName="Application" PROGRAM_PARAMS="&quot;false&quot; &quot;Test input&quot; &quot;{}&quot; &quot;//&quot; &quot;/*&quot; &quot;*/&quot;" REDIRECT_INPUT="false" ELEVATE="false" USE_EXTERNAL_CONSOLE="false" PASS_PARENT_ENVS_2="true" PROJECT_NAME="CCom" TARGET_NAME="CCom_test" CONFIG_NAME="Debug" RUN_TARGET_PROJECT_NAME="CCom" RUN_TARGET_NAME="CCom_test">
-    <envs>
-      <env name="WITH_TESTS" value="ON" />
-    </envs>
-    <method v="2">
-      <option name="com.jetbrains.cidr.execution.CidrBuildBeforeRunTaskProvider$BuildBeforeRunTask" enabled="true" />
-    </method>
-  </configuration>
 </component>

compiler/cpp/.run/CCom_test.run.xml

@@ -1,5 +1,3 @@
-set(BINARY ${CMAKE_PROJECT_NAME})
-
 set(SOURCES
         main.cpp
         util/JSONParser.cpp
@@ -13,6 +11,7 @@ set(SOURCES
         parser/Parser.cpp
         parser/Parser.h
         parser/ASTNodes.h
+        parser/ASTNodes.cpp
         analyzer/Analyzer.cpp
         analyzer/Analyzer.h
         interpreter/Interpreter.cpp
@@ -25,6 +24,6 @@ set(SOURCES
         exception/UnknownDataTypeException.h
         exception/UnexpectedDataTypeException.h)
 
-add_executable(${BINARY}_run ${SOURCES})
+add_executable(ccomc ${SOURCES})
 
-add_library(${BINARY}_lib STATIC ${SOURCES} parser/ASTNodes.cpp)
+add_library(ccomclib STATIC ${SOURCES})

compiler/cpp/src/CMakeLists.txt

@@ -1,6 +1,4 @@
-set(BINARY ${CMAKE_PROJECT_NAME}_test)
-
-add_executable(${BINARY}
+add_executable(ccomctest
         main.cpp
         ReaderTest.cpp
         LexerTest.cpp
@@ -12,8 +10,8 @@ add_executable(${BINARY}
         util/FileReader.cpp
         util/FileReader.h)
 
-add_test(NAME ${BINARY} COMMAND ${BINARY})
+add_test(NAME ccomctest COMMAND ccomctest)
 
-target_link_libraries(${BINARY} PUBLIC ${CMAKE_PROJECT_NAME}_lib gtest)
+target_link_libraries(ccomctest PUBLIC ccomclib gtest)
 
-file(COPY test-files DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
+file(CREATE_LINK ${CMAKE_CURRENT_SOURCE_DIR}/test-files ${CMAKE_CURRENT_BINARY_DIR}/test-files SYMBOLIC)