Update to latest nx, Pynx -> PyNX

Author: AileenLumina

.gitignore

@@ -1,4 +1,4 @@
 python_build/*
 !python_build/Makefile
 build/
-Pynx.*
+PyNX.*

LICENSE.md

@@ -1,4 +1,4 @@
-Copyright 2018 Pynx Authors
+Copyright 2018 PyNX Authors
 
 Permission to use, copy, modify, and/or distribute this software for any purpose with or without fee is hereby granted, provided that the above copyright notice and this permission notice appear in all copies.
 

Makefile

@@ -31,16 +31,16 @@ include $(DEVKITPRO)/libnx/switch_rules
 #---------------------------------------------------------------------------------
 TARGET		:=	$(notdir $(CURDIR))
 BUILD		:=	build
-PY_BUILD	:= python_build
-DIST_DIR	:= $(BUILD)/$(TARGET)
-LIBDIR := $(DIST_DIR)/lib/python3.5
+PY_BUILD	:=	python_build
+DIST_DIR	:=	$(BUILD)/$(TARGET)
+LIBDIR		:=	$(DIST_DIR)/lib/python3.5
 SOURCES		:=	source
 DATA		:=	data
 INCLUDES	:=	include
 EXEFS_SRC	:=	exefs_src
-APP_TITLEID	:=	Pynx
-APP_AUTHOR	:=	nx-python Authors, Python Software Foundation
-APP_VERSION	:=	0.2.0-alpha
+APP_TITLE	:=	PyNX
+APP_AUTHOR	:=	nx-python, Python Software Foundation
+APP_VERSION	:=	0.3.0-alpha
 
 #---------------------------------------------------------------------------------
 # options for code generation
@@ -153,7 +153,8 @@ dist: $(BUILD)
 	mkdir -p $(LIBDIR)
 	unzip $(PY_BUILD)/nxpy3.5.3/python.zip -d $(LIBDIR)
 	cp -r $(PY_BUILD)/nx-*/nx $(LIBDIR)
-	cp $(OUTPUT).{nro,nacp} $(DIST_DIR)/
+	cp $(OUTPUT).nro $(DIST_DIR)/
+	cp $(OUTPUT).nacp $(DIST_DIR)/
 	cp examples/hello.py $(DIST_DIR)/main.py
 	cd $(BUILD) && zip -r $(TARGET)-$(APP_VERSION).zip $(TARGET)
 

README.md

@@ -1,15 +1,15 @@
-# Pynx
+# PyNX
 
-**nx-python** is an ecosystem for developing and running Python homebrew applications on the Nintendo Switch. **Pynx** serves as the entry point to running Python apps on your Switch. It is a homebrew app that contains a port of the CPython interpreter and allows you to run Python applications from the Homebrew Menu. Just name your application `main.py` and place it next to the `pynx.nro`, and it will be executed as soon as you launch Pynx from the Homebrew Menu. Currently, **only Python 2.7 is supported**.
+**nx-python** is an ecosystem for developing and running Python homebrew applications on the Nintendo Switch. **PyNX** serves as the entry point to running Python apps on your Switch. It is a homebrew app that contains a port of the CPython interpreter and allows you to run Python applications from the Homebrew Menu. Just name your application `main.py` and place it next to the `PyNX.nro`, and it will be executed as soon as you launch PyNX from the Homebrew Menu. Currently, **only Python 2.7 is supported**.
 
-## Running Pynx on your Switch
+## Running PyNX on your Switch
 
-You don't have to compile Pynx, you can [just grab a release build](https://github.com/nx-python/Pynx/releases) and copy the content of the ZIP archive into the `/switch` folder on your SD card. Pynx will appear on the Homebrew Menu.
+You don't have to compile PyNX, you can [just grab a release build](https://github.com/nx-python/PyNX/releases) and copy the content of the ZIP archive into the `/switch` folder on your SD card. PyNX will appear on the Homebrew Menu.
 
-## Compiling Pynx
+## Compiling PyNX
 
-Compile Pynx using `make`. This will create a `Pynx` directory and build everything in there. Compiling might take a while, grab a coffee or whatever in the meantime if you like. Afterwards, create a distributable version using `make dist`. It will appear in the `build` directory.
+Compile PyNX using `make`. This will create a `PyNX` directory and build everything in there. Compiling might take a while, grab a coffee or whatever in the meantime if you like. Afterwards, create a distributable version using `make dist`. It will appear in the `build` directory.
 
 ## Having an issue?
 
-If you encounter a problem, make sure to [join our Discord](https://discord.gg/5Ga2Whf) and tell us about it, or, alternatively, you can use GitHub's [issue tracker](https://github.com/nx-python/Pynx/issues) to report an issue.
+If you encounter a problem, make sure to [join our Discord](https://discord.gg/5Ga2Whf) and tell us about it, or, alternatively, you can use GitHub's [issue tracker](https://github.com/nx-python/PyNX/issues) to report an issue.

python_build/Makefile

@@ -50,9 +50,9 @@ PYDIR  := Python-$(PYVERS)
 PYLINK := https://www.python.org/ftp/python/$(PYVERS)/Python-$(PYVERS).tgz
 PYFILE := py.tgz
 _NXFILE := _nx.zip
-_NX_VERSION := 174dfd099fcdb6dab8e521a2816e15f638de0436
-NXPKGFILE := nxpkg.zip
-NXPKG_VERSION := fe22f98eed557c0efadd2a52d2b0542ef1d246c1
+_NXVERS := 174dfd099fcdb6dab8e521a2816e15f638de0436
+NXFILE := nx.zip
+NXVERS := c1069b999d54bf72abce8d993479ea8dc53af45b
 
 .PHONY: all clean
 
@@ -76,12 +76,12 @@ distfPY: linkPY
 linkPY: soospatchPY
 	cd $(PYDIR) && make $(MAKEFLAGS) LIBRARY="$(ANAME)" LDLIBRARY="$(ANAME)" $(ANAME) && cd .. && cp $(PYDIR)/$(ANAME) . && touch linkPY
 
-clone_NX:
-	wget -O $(_NXFILE) "https://github.com/nx-python/_nx/archive/$(_NX_VERSION).zip"
-	wget -O $(NXPKGFILE) "https://github.com/nx-python/nx/archive/$(NXPKG_VERSION).zip"
+cloneNX:
+	wget -O $(_NXFILE) "https://github.com/nx-python/_nx/archive/$(_NXVERS).zip"
+	wget -O $(NXFILE) "https://github.com/nx-python/nx/archive/$(NXVERS).zip"
 	unzip -o $(_NXFILE)
-	unzip -o $(NXPKGFILE)
-	touch clone_NX
+	unzip -o $(NXFILE)
+	touch cloneNX
 
 soospatchPY: compilePY
 	cp $(PYCONFIG_DIR)/pyconfig.h $(PYDIR)/
@@ -105,7 +105,7 @@ soospatchPY: compilePY
 compilePY: extractedPY patchPY
 	cd $(PYDIR) && ./configure CC="$(CC)" CXX="$(CXX)" AS="$(AS)" AR="$(AR)" OBJCOPY="$(OBJCOPY)" STRIP="$(STRIP)" NM="$(NM)" RANLIB="$(RANLIB)" CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" ASFLAGS="$(ASFLAGS)" LDFLAGS="$(LDFLAGS)" CONFIG_SITE="config.site" --disable-shared --without-threads --without-doc-strings --without-signal-module --disable-ipv6 --host=aarch64-none-elf --build=`./config.guess` && cd .. && touch compilePY
 
-patchPY: clone_NX
+patchPY: cloneNX
 	cp $(PYDIR)/configure $(PYDIR)/configure_old
 	cat $(PYDIR)/configure_old | sed 's/	\*\-\*\-linux\*)/	\*\-\*\-linux\*\|aarch64\-none\-elf)/g' >$(PYDIR)/configure
 	echo ac_cv_file__dev_ptmx=no >$(PYDIR)/config.site
@@ -124,4 +124,4 @@ $(PYFILE):
 	wget -O "$(PYFILE)" "$(PYLINK)" || curl -Lo "$(PYFILE)" "$(PYLINK)"
 
 clean:
-	@rm -rf $(PYDIR) $(PYFILE) $(_NXFILE) $(NXPKGFILE) patchPY extractedPY compilePY linkPY distfPY soospatchPY clone_NX _nx-* nx-* libpython*.a
+	@rm -rf $(PYDIR) $(PYFILE) $(_NXFILE) $(NXFILE) patchPY extractedPY compilePY linkPY distfPY soospatchPY cloneNX _nx-* nx-* libpython*.a