Skip to content

Commit 724ae31

Browse files
DavidBuchanan314AileenLumina
authored andcommitted
Integrate nx package
1 parent 3cad67c commit 724ae31

File tree

2 files changed

+6
-1
lines changed

2 files changed

+6
-1
lines changed

Makefile

+1
Original file line numberDiff line numberDiff line change
@@ -152,6 +152,7 @@ cpython:
152152
dist: $(BUILD)
153153
mkdir -p $(LIBDIR)
154154
unzip $(PY_BUILD)/nxpy3.5.3/python.zip -d $(LIBDIR)
155+
cp -r $(PY_BUILD)/nx-*/nx $(LIBDIR)
155156
cp $(OUTPUT).{nro,nacp} $(DIST_DIR)/
156157
cp examples/hello.py $(DIST_DIR)/main.py
157158
cd $(BUILD) && zip -r $(TARGET)-$(APP_VERSION).zip $(TARGET)

python_build/Makefile

+5-1
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,8 @@ PYLINK := https://www.python.org/ftp/python/$(PYVERS)/Python-$(PYVERS).tgz
5151
PYFILE := py.tgz
5252
_NXFILE := _nx.zip
5353
_NX_VERSION := 174dfd099fcdb6dab8e521a2816e15f638de0436
54+
NXPKGFILE := nxpkg.zip
55+
NXPKG_VERSION := fe22f98eed557c0efadd2a52d2b0542ef1d246c1
5456

5557
.PHONY: all clean
5658

@@ -76,7 +78,9 @@ linkPY: soospatchPY
7678

7779
clone_NX:
7880
wget -O $(_NXFILE) "https://github.com/nx-python/_nx/archive/$(_NX_VERSION).zip"
81+
wget -O $(NXPKGFILE) "https://github.com/nx-python/nx/archive/$(NXPKG_VERSION).zip"
7982
unzip -o $(_NXFILE)
83+
unzip -o $(NXPKGFILE)
8084
touch clone_NX
8185

8286
soospatchPY: compilePY
@@ -120,4 +124,4 @@ $(PYFILE):
120124
wget -O "$(PYFILE)" "$(PYLINK)" || curl -Lo "$(PYFILE)" "$(PYLINK)"
121125

122126
clean:
123-
@rm -rf $(PYDIR) $(PYFILE) $(_NXFILE) patchPY extractedPY compilePY linkPY distfPY soospatchPY clone_NX _nx-* libpython*.a
127+
@rm -rf $(PYDIR) $(PYFILE) $(_NXFILE) $(NXPKGFILE) patchPY extractedPY compilePY linkPY distfPY soospatchPY clone_NX _nx-* nx-* libpython*.a

0 commit comments

Comments
 (0)