Skip to content

Commit c912c26

Browse files
schrnzpartipan-dot
andcommitted
Fixes: Fetching, paths, .gitignore, ARTist api
* new cmd `make fetch`: ensures that `fetch.sh` is executed in the `src` dir * fixed .gitignore to ignore the correct `src` and `debian` subfolders * `fetch.sh` fixes: Now only collecting ARTIst headers from the new api subdir Co-authored-by: Parthipan Ramesh <[email protected]>
1 parent f84f0ce commit c912c26

File tree

3 files changed

+18
-11
lines changed

3 files changed

+18
-11
lines changed

.gitignore

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1-
/src/include
2-
/src/toolchain
3-
/releases
1+
debian/*
2+
!debian/debian
3+
src/include
4+
src/toolchain
5+
releases/
6+

Makefile

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,10 @@ VERSION = 0.0.1
33
OUTPUT_FILE_NAME = $(NAME)-$(VERSION)
44
COMMON_FILES = include toolchain makefiles
55

6+
.PHONY: fetch
7+
fetch:
8+
cd src && ./fetch.sh
9+
610
.PHONY: zip
711
zip:
812
cd src && zip -r "../releases/$(OUTPUT_FILE_NAME).zip" $(COMMON_FILES) install.sh
@@ -18,10 +22,11 @@ rpm:
1822

1923
.PHONY: deb
2024
deb:
25+
cd debian/ && rm -r $(OUTPUT_FILE_NAME) $(NAME)_$(VERSION).orig.tar.gz *.buildinfo *.changes *.debian.tar.xz *.dsc 2>/dev/null || true
2126
mkdir debian/$(OUTPUT_FILE_NAME)
2227
cd src && cp -r $(COMMON_FILES) Makefile ../debian/$(OUTPUT_FILE_NAME)/
2328
cd debian && tar -zcf $(NAME)_$(VERSION).orig.tar.gz $(OUTPUT_FILE_NAME)
2429
cp -r debian/debian debian/$(OUTPUT_FILE_NAME)/
2530
cd debian/$(OUTPUT_FILE_NAME) && dpkg-buildpackage -us -uc
2631
mv debian/*.deb releases/
27-
cd debian && rm -r $(OUTPUT_FILE_NAME) $(NAME)_$(VERSION).orig.tar.gz *.buildinfo *.changes *.debian.tar.xz *.dsc
32+

src/fetch.sh

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -55,13 +55,12 @@ include_headers=(
5555
"art/compiler/dex/quick/*.h"
5656
"art/compiler/dex/quick_compiler_callbacks.h"
5757
"art/compiler/dex/*.h"
58-
"art/compiler/optimizing/*.h"
59-
"art/compiler/optimizing/artist/env/*.h"
60-
"art/compiler/optimizing/artist/verbose_printer.h"
61-
"art/compiler/optimizing/artist/injection/*.h"
62-
"art/compiler/optimizing/artist/*.h"
63-
"art/compiler/optimizing/artist/modules/*.h"
64-
"art/compiler/optimizing/artist/filtering/*.h"
58+
"art/compiler/optimizing/artist/api/env/*.h"
59+
"art/compiler/optimizing/artist/api/filtering/*.h"
60+
"art/compiler/optimizing/artist/api/injection/*.h"
61+
"art/compiler/optimizing/artist/api/io/*.h"
62+
"art/compiler/optimizing/artist/api/modules/*.h"
63+
"art/compiler/optimizing/artist/api/utils/*.h"
6564
"art/compiler/linker/*.h"
6665
"art/compiler/linker/x86/relative_patcher_x86_base.h"
6766
"art/compiler/linker/x86/relative_patcher_x86.h"

0 commit comments

Comments
 (0)