| OLD | NEW |
| 1 # Copyright (c) 2013 The Chromium Authors. All rights reserved. | 1 # Copyright (c) 2013 The Chromium Authors. All rights reserved. |
| 2 # Use of this source code is governed by a BSD-style license that can be | 2 # Use of this source code is governed by a BSD-style license that can be |
| 3 # found in the LICENSE file. | 3 # found in the LICENSE file. |
| 4 | 4 |
| 5 VALID_TOOLCHAINS := glibc newlib pnacl | 5 VALID_TOOLCHAINS := glibc newlib pnacl |
| 6 NACL_SDK_ROOT ?= $(abspath $(CURDIR)/../..) | 6 NACL_SDK_ROOT ?= $(abspath $(CURDIR)/../..) |
| 7 include $(NACL_SDK_ROOT)/tools/common.mk | 7 include $(NACL_SDK_ROOT)/tools/common.mk |
| 8 | 8 |
| 9 TARGET = python | 9 TARGET = kernel |
| 10 LIBS = python2.7 readline ncurses ppapi_simple tar nacl_io ppapi_cpp ppapi | 10 LIBS = python2.7 freetype bz2 ssl crypto z png readline ncurses ppapi_simple tar
nacl_io ppapi_cpp ppapi |
| 11 NACL_LDFLAGS += $(NACL_CLI_MAIN_LIB) | 11 NACL_LDFLAGS += $(NACL_CLI_MAIN_LIB) |
| 12 PNACL_LDFLAGS += $(NACL_CLI_MAIN_LIB) | 12 PNACL_LDFLAGS += $(NACL_CLI_MAIN_LIB) |
| 13 ifeq ($(TOOLCHAIN),glibc) | 13 ifeq ($(TOOLCHAIN),glibc) |
| 14 LIBS += util dl | 14 LIBS += util dl |
| 15 NACL_LDFLAGS += -Wl,-export-dynamic | 15 NACL_LDFLAGS += -Wl,-export-dynamic |
| 16 else | 16 else |
| 17 LIBS += glibc-compat | 17 LIBS += glibc-compat |
| 18 endif | 18 endif |
| 19 SOURCES = python.c | 19 SOURCES = kernel.cc |
| 20 INC_PATHS = $(NACLPORTS_INCLUDE)/python2.7 | 20 INC_PATHS = $(NACLPORTS_INCLUDE)/python2.7 |
| 21 INSTALL_DIR = $(NACL_PACKAGES_PUBLISH)/python/$(TOOLCHAIN) | 21 INSTALL_DIR = $(NACL_PACKAGES_PUBLISH)/ipython/$(TOOLCHAIN) |
| 22 | 22 |
| 23 ifeq ($(TOOLCHAIN),pnacl) | 23 ifeq ($(TOOLCHAIN),pnacl) |
| 24 EXEEXT=.pexe | 24 EXEEXT=.pexe |
| 25 else | 25 else |
| 26 EXEEXT=.nexe | 26 EXEEXT=.nexe |
| 27 endif | 27 endif |
| 28 | 28 |
| 29 ifneq ($(TOOLCHAIN),pnacl) | 29 ifneq ($(TOOLCHAIN),pnacl) |
| 30 # We want the nmf to contain all the .nexe we have previously | 30 # We want the nmf to contain all the .nexe we have previously |
| 31 # built as well as the one currently being built, so we modify | 31 # built as well as the one currently being built, so we modify |
| (...skipping 13 matching lines...) Expand all Loading... |
| 45 else | 45 else |
| 46 $(eval $(call LINK_RULE,$(TARGET),$(SOURCES),$(LIBS),$(DEPS))) | 46 $(eval $(call LINK_RULE,$(TARGET),$(SOURCES),$(LIBS),$(DEPS))) |
| 47 endif | 47 endif |
| 48 | 48 |
| 49 $(eval $(call NMF_RULE,$(TARGET),)) | 49 $(eval $(call NMF_RULE,$(TARGET),)) |
| 50 | 50 |
| 51 ifeq ($(TOOLCHAIN),glibc) | 51 ifeq ($(TOOLCHAIN),glibc) |
| 52 EXTRA_ASSETS = lib/libz.so.1 lib/libreadline.so lib/libncurses.so.5 | 52 EXTRA_ASSETS = lib/libz.so.1 lib/libreadline.so lib/libncurses.so.5 |
| 53 endif | 53 endif |
| 54 | 54 |
| 55 CHROMEAPPS = $(NACL_SRC)/third_party/libapps/ | |
| 56 LIB_DOT = $(CHROMEAPPS)/libdot | |
| 57 NASSH = $(CHROMEAPPS)/nassh | |
| 58 | |
| 59 install: | 55 install: |
| 60 mkdir -p $(INSTALL_DIR) | 56 mkdir -p $(INSTALL_DIR) |
| 61 tar -h -c -C ${NACLPORTS_PREFIX} -f $(INSTALL_DIR)/pydata_$(NACL_ARCH).t
ar lib/python2.7 ${EXTRA_ASSETS} | 57 tar -h -c -C ${NACLPORTS_PREFIX} -f $(INSTALL_DIR)/pydata_$(NACL_ARCH).t
ar lib/python2.7 ${EXTRA_ASSETS} |
| 62 » LIBDOT_SEARCH_PATH=$(CHROMEAPPS) $(LIB_DOT)/bin/concat.sh -i $(NASSH)/co
ncat/nassh_deps.concat -o $(INSTALL_DIR)/hterm.concat.js | 58 » cp $(OUTDIR)/$(TARGET)*$(EXEEXT) $(INSTALL_DIR) |
| 63 » cp $(OUTDIR)/python*$(EXEEXT) $(INSTALL_DIR) | |
| 64 rm -f $(INSTALL_DIR)/*_unstripped_*$(EXEEXT) | 59 rm -f $(INSTALL_DIR)/*_unstripped_*$(EXEEXT) |
| 65 » cp $(OUTDIR)/python.nmf $(INSTALL_DIR) | 60 » cp $(OUTDIR)/$(TARGET).nmf $(INSTALL_DIR) |
| 66 » cp index.html $(INSTALL_DIR) | 61 » cp kernel.py $(INSTALL_DIR) |
| 67 » cp python.js $(INSTALL_DIR) | |
| 68 » cp ../../build_tools/naclterm.js $(INSTALL_DIR) | |
| 69 » cp manifest.json ${INSTALL_DIR} | |
| 70 » cp background.js ${INSTALL_DIR} | |
| 71 » cp icon_16.png ${INSTALL_DIR} | |
| 72 » cp icon_48.png ${INSTALL_DIR} | |
| 73 » cp icon_128.png ${INSTALL_DIR} | |
| 74 ifeq ($(TOOLCHAIN),pnacl) | |
| 75 » sed -i.bak 's/x-nacl/x-pnacl/g' $(INSTALL_DIR)/naclterm.js | |
| 76 endif | |
| 77 ifeq ($(TOOLCHAIN),glibc) | 62 ifeq ($(TOOLCHAIN),glibc) |
| 78 cp -r $(OUTDIR)/lib* $(INSTALL_DIR) | 63 cp -r $(OUTDIR)/lib* $(INSTALL_DIR) |
| 79 endif | 64 endif |
| 80 cd $(INSTALL_DIR) && rm -f python.zip && zip -r python.zip . | |
| OLD | NEW |