Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

MinGW Makefileにもbregonig.dllとctags.exeのzip展開を組み込む #1663

Merged
merged 2 commits into from
May 11, 2021
Merged

MinGW Makefileにもbregonig.dllとctags.exeのzip展開を組み込む #1663

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9655fa3
MinGW Makefileにbregonigとctagsのzip展開を組み込む
berryzplus May 9, 2021
9c5387b
7zのパスを訂正
berryzplus May 10, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions ci/azure-pipelines/template.steps.install-mingw-w64-gcc.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,8 @@
# なし
#############################################################################################################
steps:
- script: C:\msys64\usr\bin\bash --login -c "pacman -S --noconfirm p7zip"
displayName: install 7zip

- script: C:\msys64\usr\bin\bash --login -c "pacman -S --noconfirm mingw-w64-x86_64-gtest"
displayName: install MinGW-w64-gtest
14 changes: 13 additions & 1 deletion sakura_core/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ DIRSEP = $(strip \ )
DEVNULL = NUL
ICONV = C:\msys64\usr\bin\iconv.exe
SED = C:\msys64\usr\bin\sed.exe
P7Z = C:\msys64\usr\bin\7z
else
# If unix-like shell is used.
MKDIR = mkdir -p
Expand All @@ -39,6 +40,7 @@ DIRSEP = /
DEVNULL = /dev/null
ICONV = iconv
SED = sed
P7Z = 7z
endif

ifndef PREFIX
Expand Down Expand Up @@ -100,6 +102,8 @@ LIBS= \
$(MYLIBS)

exe= $(or $(OUTDIR),.)/sakura.exe
bregonig= $(or $(OUTDIR),.)/bregonig.dll
ctags= $(or $(OUTDIR),.)/ctags.exe

SRCS = $(wildcard $(SRCDIR)/*.cpp) \
$(wildcard $(SRCDIR)/*/*.cpp) \
Expand All @@ -120,11 +124,19 @@ GENERATED_FILES= \
HEADERMAKETOOLDIR= $(SRCDIR)/../HeaderMake
HEADERMAKE= $(or $(OUTDIR),$(HEADERMAKETOOLDIR))/HeaderMake.exe

all: $(exe)
all: $(exe) \
$(bregonig) \
$(ctags)

$(exe): $(OBJS) sakura_rc.o
$(CXX) -o $@ $(OBJS) sakura_rc.o $(LIBS)

$(bregonig): ../installer/externals/bregonig/bron420.zip
$(P7Z) e $< -o$(@D) -y x64/$(@F)

$(ctags): ../installer/externals/universal-ctags/ctags-2020-01-12_feffe43a-x64.zip
$(P7Z) e $< -o$(@D) -y $(@F)

Funccode_define.h: Funccode_x.hsrc $(HEADERMAKE)
$(HEADERMAKE) -in=$< -out=$@ -mode=define

Expand Down