reorganise the project folder to simplify it
This commit is contained in:
parent
dd60045670
commit
75490acdee
@ -1,9 +1,6 @@
|
||||
|
||||
|
||||
PROJECT_PACKAGE=$(PROJECT_NAME)package
|
||||
JAVA_FOLDER=src/com/$(PROJECT_VENDOR)/$(PROJECT_NAME)
|
||||
EWOL_JAVA_FOLDER=src/org/ewol
|
||||
|
||||
|
||||
USER_PACKAGES += $(EWOL_FOLDER)/Sources/
|
||||
TARGET_OS = Android
|
||||
@ -11,55 +8,54 @@ TARGET_ARCH = ARM
|
||||
CROSS = $(PROJECT_NDK)/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin/arm-linux-androideabi-
|
||||
|
||||
|
||||
#$(info (sh) Create folder : $(JAVA_FOLDER)/ & $(EWOL_JAVA_FOLDER))
|
||||
$(shell mkdir -p $(JAVA_FOLDER)/)
|
||||
$(shell mkdir -p $(EWOL_JAVA_FOLDER)/)
|
||||
#Add the basic element abstraction of ewol lib
|
||||
$(shell cp $(EWOL_FOLDER)/Java/ewolAndroidAbstraction.cpp Sources/)
|
||||
$(shell sed -i "s|__PROJECT_VENDOR__|$(PROJECT_VENDOR)|" Sources/ewolAndroidAbstraction.cpp)
|
||||
$(shell sed -i "s|__PROJECT_NAME__|$(PROJECT_NAME)|" Sources/ewolAndroidAbstraction.cpp)
|
||||
$(shell sed -i "s|__PROJECT_PACKAGE__|$(PROJECT_PACKAGE)|" Sources/ewolAndroidAbstraction.cpp)
|
||||
|
||||
#$(info (sh) copy the java Files & Replace __XXX__ element with project properties)
|
||||
tmp=$(shell cp $(EWOL_FOLDER)/Java/PROJECT_NAME.java $(JAVA_FOLDER)/$(PROJECT_NAME).java)
|
||||
tmp+=$(shell sed -i "s|__PROJECT_VENDOR__|$(PROJECT_VENDOR)|" $(JAVA_FOLDER)/$(PROJECT_NAME).java)
|
||||
tmp+=$(shell sed -i "s|__PROJECT_NAME__|$(PROJECT_NAME)|" $(JAVA_FOLDER)/$(PROJECT_NAME).java)
|
||||
tmp+=$(shell sed -i "s|__PROJECT_PACKAGE__|$(PROJECT_PACKAGE)|" $(JAVA_FOLDER)/$(PROJECT_NAME).java)
|
||||
# copy the Ewol java files :
|
||||
tmp+=$(shell cp $(EWOL_FOLDER)/Java/interfaceJNI.java $(EWOL_JAVA_FOLDER)/)
|
||||
tmp+=$(shell cp $(EWOL_FOLDER)/Java/interfaceOpenGL.java $(EWOL_JAVA_FOLDER)/)
|
||||
tmp+=$(shell cp $(EWOL_FOLDER)/Java/interfaceSurfaceView.java $(EWOL_JAVA_FOLDER)/)
|
||||
tmp+=$(shell cp $(EWOL_FOLDER)/Java/interfaceAudio.java $(EWOL_JAVA_FOLDER)/)
|
||||
$(info $(tmp))
|
||||
|
||||
#$(info (sh) copy the cpp for jni File : $(EWOL_FOLDER)/Java/ewolAndroidAbstraction.cpp)
|
||||
tmp=$(shell cp $(EWOL_FOLDER)/Java/ewolAndroidAbstraction.cpp jni/)
|
||||
tmp+=$(shell sed -i "s|__PROJECT_VENDOR__|$(PROJECT_VENDOR)|" jni/ewolAndroidAbstraction.cpp)
|
||||
tmp+=$(shell sed -i "s|__PROJECT_NAME__|$(PROJECT_NAME)|" jni/ewolAndroidAbstraction.cpp)
|
||||
tmp+=$(shell sed -i "s|__PROJECT_PACKAGE__|$(PROJECT_PACKAGE)|" jni/ewolAndroidAbstraction.cpp)
|
||||
$(info $(tmp))
|
||||
|
||||
ANDROID_BOARD_ID = 14
|
||||
TARGET_GLOBAL_C_INCLUDES+=-I$(PROJECT_NDK)/platforms/android-$(ANDROID_BOARD_ID)/arch-arm/usr/include
|
||||
TARGET_GLOBAL_LDLIBS_SHARED = --sysroot=$(PROJECT_NDK)/platforms/android-$(ANDROID_BOARD_ID)/arch-arm
|
||||
|
||||
#generic makefile
|
||||
include $(EWOL_FOLDER)/Build/core/main.mk
|
||||
|
||||
java : all
|
||||
@mkdir -p libs/armeabi/
|
||||
# note : this change the lib name ...
|
||||
cp ./out_$(TARGET_OS)/$(BUILD_DIRECTORY_MODE)/obj/usr/lib/$(PROJECT_PACKAGE).so libs/armeabi/lib$(PROJECT_PACKAGE).so
|
||||
ANDROID_BASIC_FOLDER=./out/$(TARGET_OS)/$(BUILD_DIRECTORY_MODE)/ant/
|
||||
JAVA_FOLDER=$(ANDROID_BASIC_FOLDER)src/com/$(PROJECT_VENDOR)/$(PROJECT_NAME)
|
||||
EWOL_JAVA_FOLDER=$(ANDROID_BASIC_FOLDER)src/org/ewol
|
||||
|
||||
java :
|
||||
@mkdir -p $(JAVA_FOLDER)/
|
||||
@mkdir -p $(EWOL_JAVA_FOLDER)/
|
||||
|
||||
@cp $(EWOL_FOLDER)/Java/PROJECT_NAME.java $(JAVA_FOLDER)/$(PROJECT_NAME).java
|
||||
@sed -i "s|__PROJECT_VENDOR__|$(PROJECT_VENDOR)|" $(JAVA_FOLDER)/$(PROJECT_NAME).java
|
||||
@sed -i "s|__PROJECT_NAME__|$(PROJECT_NAME)|" $(JAVA_FOLDER)/$(PROJECT_NAME).java
|
||||
@sed -i "s|__PROJECT_PACKAGE__|$(PROJECT_PACKAGE)|" $(JAVA_FOLDER)/$(PROJECT_NAME).java
|
||||
@# copy the Ewol java files :
|
||||
@cp $(EWOL_FOLDER)/Java/interfaceJNI.java $(EWOL_JAVA_FOLDER)/
|
||||
@cp $(EWOL_FOLDER)/Java/interfaceOpenGL.java $(EWOL_JAVA_FOLDER)/
|
||||
@cp $(EWOL_FOLDER)/Java/interfaceSurfaceView.java $(EWOL_JAVA_FOLDER)/
|
||||
@cp $(EWOL_FOLDER)/Java/interfaceAudio.java $(EWOL_JAVA_FOLDER)/
|
||||
|
||||
@# copy android specific data :
|
||||
@cp -r Android/* $(ANDROID_BASIC_FOLDER)/
|
||||
@# copy user data
|
||||
@cp -r share $(ANDROID_BASIC_FOLDER)/assets
|
||||
@mkdir -p $(ANDROID_BASIC_FOLDER)libs/armeabi/
|
||||
@# note : this change the lib name ...
|
||||
@cp ./out/$(TARGET_OS)/$(BUILD_DIRECTORY_MODE)/obj/usr/lib/$(PROJECT_PACKAGE).so $(ANDROID_BASIC_FOLDER)libs/armeabi/lib$(PROJECT_PACKAGE).so
|
||||
@echo " (ant) build java code"
|
||||
PATH=$(PROJECT_SDK)/tools/:$(PROJECT_SDK)/platform-tools/:$(PATH) ant -Dsdk.dir=$(PROJECT_SDK) $(BUILD_DIRECTORY_MODE)
|
||||
@echo " (sh) Clear previous sources "
|
||||
@rm -rf src jni/ewolAndroidAbstraction.cpp
|
||||
@cd $(ANDROID_BASIC_FOLDER) ; PATH=$(PROJECT_SDK)/tools/:$(PROJECT_SDK)/platform-tools/:$(PATH) ant -Dsdk.dir=$(PROJECT_SDK) $(BUILD_DIRECTORY_MODE)
|
||||
|
||||
|
||||
install: java
|
||||
install:
|
||||
@echo "------------------------------------------------------------------------"
|
||||
@echo ' INSTALL : ./bin/$(PROJECT_NAME)-debug.apk'
|
||||
@echo "------------------------------------------------------------------------"
|
||||
@# $(PROJECT_SDK)/platform-tools/adb kill-server
|
||||
@# install application
|
||||
sudo $(PROJECT_SDK)/platform-tools/adb install -r ./bin/$(PROJECT_NAME)-$(BUILD_DIRECTORY_MODE).apk
|
||||
sudo $(PROJECT_SDK)/platform-tools/adb install -r $(ANDROID_BASIC_FOLDER)bin/$(PROJECT_NAME)-$(BUILD_DIRECTORY_MODE).apk
|
||||
|
||||
#localclean:
|
||||
# @echo "------------------------------------------------------------------------"
|
||||
# @echo ' Remove : bin libs gen obj'
|
||||
# @echo "------------------------------------------------------------------------"
|
||||
# rm -rf bin libs gen obj
|
||||
|
||||
11
core/main.mk
11
core/main.mk
@ -118,9 +118,9 @@ else
|
||||
BUILD_DIRECTORY_MODE := release
|
||||
endif
|
||||
|
||||
TARGET_OUT_BUILD ?= $(shell pwd)/out_$(TARGET_OS)/$(BUILD_DIRECTORY_MODE)/obj
|
||||
TARGET_OUT_STAGING ?= $(shell pwd)/out_$(TARGET_OS)/$(BUILD_DIRECTORY_MODE)/obj
|
||||
TARGET_OUT_FINAL ?= $(shell pwd)/out_$(TARGET_OS)/$(BUILD_DIRECTORY_MODE)/bin
|
||||
TARGET_OUT_BUILD ?= $(shell pwd)/out/$(TARGET_OS)/$(BUILD_DIRECTORY_MODE)/obj
|
||||
TARGET_OUT_STAGING ?= $(shell pwd)/out/$(TARGET_OS)/$(BUILD_DIRECTORY_MODE)/obj
|
||||
TARGET_OUT_FINAL ?= $(shell pwd)/out/$(TARGET_OS)/$(BUILD_DIRECTORY_MODE)/bin
|
||||
|
||||
# Makefile with the list of all makefiles available and include them
|
||||
SCAN_TARGET := scan
|
||||
@ -152,9 +152,10 @@ $(foreach __makefile,$(_tmpDirectory), \
|
||||
$(eval makefiles += $(__makefile)Generic.mk) \
|
||||
) \
|
||||
)
|
||||
ifeq ("$(V)","1")
|
||||
$(info makefiles="$(makefiles)")
|
||||
endif
|
||||
# import all the makefiles
|
||||
$(info makefiles="$(makefiles)")
|
||||
|
||||
include $(makefiles)
|
||||
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user