From 2a927c21fc276c77ff4738581a037198f2418b30 Mon Sep 17 00:00:00 2001 From: nishi Date: Sun, 9 Jun 2024 14:13:03 +0000 Subject: [PATCH] fix makefile git-svn-id: file:///raid/svn-main/nishi-dataworks/trunk@215 d4a5a174-5a4a-5b4b-b672-37683c10d7d5 --- .github/workflows/build.yml | 12 +++++++++--- common.mk | 3 +-- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 8523134..975b023 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -22,16 +22,22 @@ jobs: restore-keys: pkgcache- - name: Install packages run: sudo apt-get install zip byacc flex doxygen mingw-w64 graphviz + - name: make sure it is clean (linux64) + run: make clean - name: make for linux64 - run: make YACC=byacc -j3 clean archive + run: make YACC=byacc -j3 archive - name: rename to -linux64 run: mv dataworks.tar.gz dataworks-linux64.tar.gz + - name: make sure it is clean (win32) + run: make clean - name: make for win32 - run: make YACC=byacc PLATFORM=win32 -j3 clean archive + run: make YACC=byacc PLATFORM=win32 -j3 archive - name: rename to -win32 run: mv dataworks.tar.gz dataworks-win32.tar.gz + - name: make sure it is clean (win64) + run: make clean - name: make for win64 - run: make YACC=byacc PLATFORM=win64 -j3 clean archive + run: make YACC=byacc PLATFORM=win64 -j3 archive - name: rename to -win64 run: mv dataworks.tar.gz dataworks-win64.tar.gz - name: release diff --git a/common.mk b/common.mk index c931c3b..ffd64b9 100644 --- a/common.mk +++ b/common.mk @@ -35,7 +35,6 @@ format: clang-format -i $(FILES) clean: - rm -f *.zip *.tar.gz $(MAKE) -C ./Grammar clean $(COMPILE_FLAGS) $(MAKE) -C ./Library clean $(COMPILE_FLAGS) $(MAKE) -C ./Client clean $(COMPILE_FLAGS) @@ -43,7 +42,7 @@ clean: $(MAKE) -C ./Document clean $(COMPILE_FLAGS) archive-prepare: all - rm -f *.zip *.tar.gz + rm -f dataworks.zip dataworks.tar.gz rm -rf dataworks-dist mkdir -p dataworks-dist mkdir -p dataworks-dist/Server -- 2.43.0