Skip to content

Add terminal in default main file #10

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
0x78f1935 wants to merge 6 commits into from
Closed

Add terminal in default main file #10

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
090244e
Add terminal te default build
Aug 25, 2018
83cee71
Fix log issue within terminal
Aug 25, 2018
b5b7d0e
add auto downloader
Aug 25, 2018
f768ca1
delete unrelated files
Aug 25, 2018
430299d
Remove downloaded files keep installed lib
Aug 25, 2018
20aa9d8
Fix infinite loop which causes memory overflow
Aug 25, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,7 @@ python_build/*
!python_build/Makefile
build/
PyNX.*
.cproject
.idea
.project
.settings
10 changes: 9 additions & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,6 +135,10 @@ endif
#---------------------------------------------------------------------------------
all: $(BUILD)

TERMINAL := PyNX_Terminal.zip
TERMIVER := e56589f9e70cb23ec3aa8a140afeb9a3de9e4def
TERMIFOL := PyNX_Terminal-$(TERMIVER)

$(BUILD): cpython
@[ -d $@ ] || mkdir -p $@
@$(MAKE) --no-print-directory -C $(BUILD) -f $(CURDIR)/Makefile
Expand All @@ -149,7 +153,11 @@ dist: $(BUILD)
cp -r $(PY_BUILD)/imgui-switch-*/dist/python/* $(LIBDIR)
cp $(OUTPUT).nro $(DIST_DIR)/
cp $(OUTPUT).nacp $(DIST_DIR)/
cp $(PY_BUILD)/imgui-switch-*/main.py $(DIST_DIR)/
wget -O $(CURDIR)/$(TERMINAL) "https://github.com/Annihilator708/PyNX_Terminal/archive/$(TERMIVER).zip"
unzip -o $(TERMINAL)
cp $(CURDIR)/$(TERMIFOL)/PyNX/main.py $(DIST_DIR)/
cp $(CURDIR)/$(TERMIFOL)/PyNX/lib/python3.5/terminal.py $(CURDIR)/build/PyNX/lib/python3.5
rm -rf $(CURDIR)/$(TERMIFOL) && rm -rf $(CURDIR)/$(TERMINAL)
cd $(BUILD) && zip -r $(TARGET)-$(APP_VERSION).zip $(TARGET)

#---------------------------------------------------------------------------------
Expand Down
3 changes: 1 addition & 2 deletions python_build/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,6 @@ IMGUIFILE := imgui.zip
IMGUIVERS := 179360f82770850f1af2f03c631d01a9ff839b57



.PHONY: all clean

all: distfPY
Expand Down Expand Up @@ -110,7 +109,7 @@ soospatchPY: compilePY
cp $(PYCONFIG_DIR)/thread_nx.h $(PYDIR)/Python/
cp $(PYCONFIG_DIR)/condvar.h $(PYDIR)/Python/
cp $(PYCONFIG_DIR)/pylifecycle.c $(PYDIR)/Python/
cp $(PYCONFIG_DIR)/ceval_gil.h $(PYDIR)/Python/
cp $(PYCONFIG_DIR)/ceval_gil.h $(PYDIR)/Python/
cp $(PYDIR)/Modules/posixmodule.c $(PYDIR)/Modules/posixmodule.c_old
cat $(PYDIR)/Modules/posixmodule.c_old | $(SED) 's/return utime(path, time)/errno=ENOENT; return -1/g' | $(SED) 's/define LSTAT lstat/define LSTAT stat/' | $(SED) '1s/^/#include <sys\/socket.h>/' | $(SED) 's/access(path->narrow, mode)/1/' | $(SED) 's/\(^[^rt]*time_t atime, mtime;.*\)/return NULL; \1/' | $(SED) 's/\(^[^ri]*int i = (int)umask(mask);.*\)/int i=0; return NULL;/' | $(SED) 's/^\([^#][^#]*#undef HAVE_FSTATVFS.*\)/\#undef HAVE_FSTATVFS \1/' | $(SED) 's/#define HAVE_\(EXECV\|FORK\|GETEGID\|GETEUID\|GETGID\|GETPPID\|GETUID\|KILL\|PIPE\|POPEN\|SYSTEM\|TTYNAME\|SYMLINK\|UTIME_H\|FDATASYNC\).*/#undef HAVE_\1/g' | $(SED) 's/^#define HAVE_\(STATVFS\|SYS_STATVFS_H\|FDATASYNC\|FTIME\|SYMLINK\|EXECV\|FORK\|GETEGID\|GETEUID\|GETGID\|GETPPID\|GETUID\|KILL\|PIPE\|POPEN\|SYSTEM\|TTYNAME\|SYMLINK\|UTIME_H\|FDATASYNC\).*/#undef HAVE_\1/' >$(PYDIR)/Modules/posixmodule.c
cp $(PYDIR)/Modules/socketmodule.c $(PYDIR)/Modules/socketmodule.c_old
Expand Down