From 6eca02d8fe77817970905abf8792142db33f992e Mon Sep 17 00:00:00 2001 From: =?utf8?q?=EC=98=A4=ED=98=95=EC=84=9D/On-Device=20Lab=28SR=29/Staff?= =?utf8?q?=20Engineer/=EC=82=BC=EC=84=B1=EC=A0=84=EC=9E=90?= Date: Thu, 11 Jul 2019 12:54:56 +0900 Subject: [PATCH] Remove makefile (#5595) * Remove makefile Rename Makefile to Makefile.template to remove Makefile Signed-off-by: Hyeongseok Oh * Update build script and gitignore list file * Update template makefile and standalone scripts --- .gitignore | 3 +++ Makefile => Makefile.template | 12 ++++-------- packaging/nnfw.spec | 6 +++--- scripts/standalone/docker_build_cross_arm.sh | 6 +++--- scripts/standalone/docker_build_cross_arm_benchmark_model.sh | 6 +++--- scripts/standalone/docker_build_cross_arm_neurun.sh | 6 +++--- scripts/standalone/docker_build_cross_arm_neurun_release.sh | 6 +++--- scripts/standalone/docker_build_cross_arm_release.sh | 6 +++--- scripts/standalone/docker_build_cross_coverage.sh | 6 +++--- scripts/standalone/docker_build_test_x64.sh | 6 +++--- scripts/standalone/docker_build_tizen_cross.sh | 6 +++--- 11 files changed, 34 insertions(+), 35 deletions(-) rename Makefile => Makefile.template (95%) diff --git a/.gitignore b/.gitignore index 0a27440..b535dd4 100644 --- a/.gitignore +++ b/.gitignore @@ -37,3 +37,6 @@ # Coverage /gcov /coverage + +# Makefile +/Makefile diff --git a/Makefile b/Makefile.template similarity index 95% rename from Makefile rename to Makefile.template index 0db0570..f93d2db 100644 --- a/Makefile +++ b/Makefile.template @@ -169,14 +169,10 @@ build_coverage_suite: install_internal $(WORKDIR): mkdir -p $@ -$(BUILD_ROOT): $(WORKDIR) - make configure_internal +$(BUILD_ROOT): $(WORKDIR) configure_internal -$(TIMESTAMP_CONFIGURE): - make configure_internal +$(TIMESTAMP_CONFIGURE): configure_internal -$(TIMESTAMP_BUILD): $(TIMESTAMP_CONFIGURE) - make build_internal +$(TIMESTAMP_BUILD): $(TIMESTAMP_CONFIGURE) build_internal -$(TIMESTAMP_INSTALL): $(TIMESTAMP_BUILD) - make install_internal +$(TIMESTAMP_INSTALL): $(TIMESTAMP_BUILD) install_internal diff --git a/packaging/nnfw.spec b/packaging/nnfw.spec index a06416c..76a53df 100644 --- a/packaging/nnfw.spec +++ b/packaging/nnfw.spec @@ -64,12 +64,12 @@ tar -xf %{SOURCE1001} %build %ifarch arm armv7l aarch64 -%{build_options} make %{?jobs:-j%jobs} +%{build_options} make -f Makefile.template %{?jobs:-j%jobs} all %endif %install %ifarch arm armv7l aarch64 -%{build_options} make install +%{build_options} make -f Makefile.template install %ifarch aarch64 mv %{buildroot}%{_prefix}/lib %{buildroot}%{_libdir} @@ -89,7 +89,7 @@ cp -rf ./tests/framework %{buildroot}%{test_install_prefix}/framework mkdir -p %{buildroot}%{test_install_prefix}/tools cp -rf ./tests/scripts %{buildroot}%{test_install_prefix}/tools %else -%{build_options} make build_coverage_suite +%{build_options} make -f Makefile.template build_coverage_suite mkdir -p %{buildroot}%{test_install_prefix} cp -rf Product/out/coverage-suite.tar.gz %{buildroot}%{test_install_prefix}/. tar -zxf %{buildroot}%{test_install_prefix}/coverage-suite.tar.gz -C %{buildroot}%{test_install_prefix} diff --git a/scripts/standalone/docker_build_cross_arm.sh b/scripts/standalone/docker_build_cross_arm.sh index 76097d6..243aefa 100755 --- a/scripts/standalone/docker_build_cross_arm.sh +++ b/scripts/standalone/docker_build_cross_arm.sh @@ -40,9 +40,9 @@ pushd $ROOT_PATH > /dev/null # TODO use command instead of makefile CMD="export OPTIONS='-DBUILD_NEURUN=OFF -DBUILD_PURE_ARM_COMPUTE=ON -DBUILD_TFLITE_LOADER=OFF' && \ - make && \ - make install && \ - make build_test_suite" + make -f Makefile.template && \ + make -f Makefile.template install && \ + make -f Makefile.template build_test_suite" source nnfw docker-run-user bash -c "${CMD}" popd > /dev/null diff --git a/scripts/standalone/docker_build_cross_arm_benchmark_model.sh b/scripts/standalone/docker_build_cross_arm_benchmark_model.sh index d477e4a..5351973 100755 --- a/scripts/standalone/docker_build_cross_arm_benchmark_model.sh +++ b/scripts/standalone/docker_build_cross_arm_benchmark_model.sh @@ -43,9 +43,9 @@ pushd $ROOT_PATH > /dev/null # TODO use command instead of makefile CMD="export OPTIONS='-DBUILD_PURE_ARM_COMPUTE=ON -DBUILD_NEURUN=OFF -DBUILD_TFLITE_BENCHMARK_MODEL=ON -DBUILD_TFLITE_LOADER=OFF' && \ - make && \ - make install && \ - make build_test_suite" + make -f Makefile.template && \ + make -f Makefile.template install && \ + make -f Makefile.template build_test_suite" source nnfw docker-run-user bash -c "$CMD" popd > /dev/null diff --git a/scripts/standalone/docker_build_cross_arm_neurun.sh b/scripts/standalone/docker_build_cross_arm_neurun.sh index 4d768ee..a68eacc 100755 --- a/scripts/standalone/docker_build_cross_arm_neurun.sh +++ b/scripts/standalone/docker_build_cross_arm_neurun.sh @@ -40,9 +40,9 @@ set -e pushd $ROOT_PATH > /dev/null # TODO use command instead of makefile -CMD="make && \ - make install && \ - make build_test_suite" +CMD="make -f Makefile.template && \ + make -f Makefile.template install && \ + make -f Makefile.template build_test_suite" source nnfw docker-run-user bash -c "$CMD" popd > /dev/null diff --git a/scripts/standalone/docker_build_cross_arm_neurun_release.sh b/scripts/standalone/docker_build_cross_arm_neurun_release.sh index 893d9a7..f62bc14 100755 --- a/scripts/standalone/docker_build_cross_arm_neurun_release.sh +++ b/scripts/standalone/docker_build_cross_arm_neurun_release.sh @@ -41,9 +41,9 @@ set -e pushd $ROOT_PATH > /dev/null # TODO use command instead of makefile -CMD="make && \ - make install && \ - make build_test_suite" +CMD="make -f Makefile.template && \ + make -f Makefile.template install && \ + make -f Makefile.template build_test_suite" source nnfw docker-run-user bash -c "$CMD" popd > /dev/null diff --git a/scripts/standalone/docker_build_cross_arm_release.sh b/scripts/standalone/docker_build_cross_arm_release.sh index 1cf417a..9552c24 100755 --- a/scripts/standalone/docker_build_cross_arm_release.sh +++ b/scripts/standalone/docker_build_cross_arm_release.sh @@ -42,9 +42,9 @@ pushd $ROOT_PATH > /dev/null # TODO use command instead of makefile CMD="export OPTIONS='-DBUILD_NEURUN=OFF -DBUILD_PURE_ARM_COMPUTE=ON -DBUILD_TFLITE_LOADER=OFF' && \ - make && \ - make install && \ - make build_test_suite" + make -f Makefile.template && \ + make -f Makefile.template install && \ + make -f Makefile.template build_test_suite" source nnfw docker-run-user bash -c "${CMD}" popd > /dev/null diff --git a/scripts/standalone/docker_build_cross_coverage.sh b/scripts/standalone/docker_build_cross_coverage.sh index 85fbb57..bd4d19c 100755 --- a/scripts/standalone/docker_build_cross_coverage.sh +++ b/scripts/standalone/docker_build_cross_coverage.sh @@ -47,9 +47,9 @@ set -e pushd $ROOT_PATH > /dev/null # TODO use command instead of makefile -CMD="make && \ - make install && \ - make build_coverage_suite" +CMD="make -f Makefile.template && \ + make -f Makefile.template install && \ + make -f Makefile.template build_coverage_suite" source nnfw docker-run-user bash -c "$CMD" popd > /dev/null diff --git a/scripts/standalone/docker_build_test_x64.sh b/scripts/standalone/docker_build_test_x64.sh index 11bbfcf..501e147 100755 --- a/scripts/standalone/docker_build_test_x64.sh +++ b/scripts/standalone/docker_build_test_x64.sh @@ -19,9 +19,9 @@ set -e pushd $ROOT_PATH > /dev/null -CMD="make && \ - make install && \ - make build_test_suite" +CMD="make -f Makefile.template && \ + make -f Makefile.template install && \ + make -f Makefile.template build_test_suite" source nnfw docker-run-user bash -c "$CMD" diff --git a/scripts/standalone/docker_build_tizen_cross.sh b/scripts/standalone/docker_build_tizen_cross.sh index bea21b6..4801579 100755 --- a/scripts/standalone/docker_build_tizen_cross.sh +++ b/scripts/standalone/docker_build_tizen_cross.sh @@ -35,9 +35,9 @@ set -e pushd $ROOT_PATH > /dev/null -CMD="make && \ - make install && \ - make build_test_suite" +CMD="make -f Makefile.template && \ + make -f Makefile.template install && \ + make -f Makefile.template build_test_suite" source nnfw docker-run-user bash -c "$CMD" popd > /dev/null -- 2.7.4