Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1253)

Unified Diff: ports/ipython_extension/Makefile

Issue 165473002: Adds an IPython kernel running in NaCl, and a wrapper as a Chrome extension. Base URL: https://naclports.googlecode.com/svn/trunk/src
Patch Set: Created 6 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: ports/ipython_extension/Makefile
diff --git a/ports/python_ppapi/Makefile b/ports/ipython_extension/Makefile
similarity index 81%
copy from ports/python_ppapi/Makefile
copy to ports/ipython_extension/Makefile
index 1c445c9c47057b8e905e9bd9a911ede8de5fe712..2b008aa51f951ab32cc10b7b85726f3b878f9fe3 100644
--- a/ports/python_ppapi/Makefile
+++ b/ports/ipython_extension/Makefile
@@ -7,14 +7,14 @@ NACL_SDK_ROOT ?= $(abspath $(CURDIR)/../..)
include $(NACL_SDK_ROOT)/tools/common.mk
TARGET = python
-LIBS = python2.7 readline ncurses ppapi_simple tar nacl_io ppapi_cpp ppapi
+LIBS = python2.7 ssl crypto z freetype png readline ncurses ppapi_simple tar nacl_io ppapi_cpp ppapi
ifeq ($(TOOLCHAIN),glibc)
LIBS += util dl
NACL_LDFLAGS += -Wl,-export-dynamic
else
LIBS += glibc-compat
endif
-SOURCES = python.c
+SOURCES = python.cc
INC_PATHS = $(NACLPORTS_INCLUDE)/python2.7
INSTALL_DIR = $(NACL_PACKAGES_PUBLISH)/python/$(TOOLCHAIN)
@@ -57,20 +57,13 @@ NASSH = $(CHROMEAPPS)/nassh
install:
mkdir -p $(INSTALL_DIR)
tar -h -c -C ${NACLPORTS_PREFIX} -f $(INSTALL_DIR)/pydata_$(NACL_ARCH).tar lib/python2.7 ${EXTRA_ASSETS}
- LIBDOT_SEARCH_PATH=$(CHROMEAPPS) $(LIB_DOT)/bin/concat.sh -i $(NASSH)/concat/nassh_deps.concat -o $(INSTALL_DIR)/hterm.concat.js
cp $(OUTDIR)/python*$(EXEEXT) $(INSTALL_DIR)
rm -f $(INSTALL_DIR)/*_unstripped_*$(EXEEXT)
cp $(OUTDIR)/python.nmf $(INSTALL_DIR)
- cp index.html $(INSTALL_DIR)
- cp python.js $(INSTALL_DIR)
- cp ../../build_tools/naclterm.js $(INSTALL_DIR)
cp manifest.json ${INSTALL_DIR}
cp background.js ${INSTALL_DIR}
- cp icon_16.png ${INSTALL_DIR}
- cp icon_48.png ${INSTALL_DIR}
- cp icon_128.png ${INSTALL_DIR}
ifeq ($(TOOLCHAIN),pnacl)
- sed -i 's/x-nacl/x-pnacl/g' $(INSTALL_DIR)/naclterm.js
+ sed -i 's/x-nacl/x-pnacl/g' $(INSTALL_DIR)/background.js
endif
ifeq ($(TOOLCHAIN),glibc)
cp -r $(OUTDIR)/lib* $(INSTALL_DIR)

Powered by Google App Engine
This is Rietveld 408576698