Skip to content

Commit

Permalink
Build 22 (v1.22)
Browse files Browse the repository at this point in the history
+ Make filenames less dreadful.
+ Adds a makefile for easy building and releases
  (on Linux systems, at least.)
- Remove unnessecary `New Stuff.txt`.
+ New build instructions.
  • Loading branch information
KScott committed Jan 24, 2020
1 parent 71644f9 commit dc3e78c
Show file tree
Hide file tree
Showing 8 changed files with 67 additions and 32 deletions.
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,5 @@ dist/**
__pycache__/**
__pycache__
build
build/**
build/**
Release.zip
File renamed without changes.
6 changes: 6 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
Release.zip: clean Scrambler.py Engine.py Themes.py Assets
pyinstaller Scrambler.py -w -F -i Assets/favi.ico
7z a Release.zip ./dist/* Assets

clean:
rm -rf __pycache__ dist build *.spec *.exe Release.zip
12 changes: 0 additions & 12 deletions New Stuff.txt

This file was deleted.

67 changes: 52 additions & 15 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,35 +1,72 @@
# Scares-Scrambler-Class-Rebuild
# Scares Scrambler

The place where all current/future Scares Scrambler stuff will happen
(at least, in it's current form).
The place where all current/future Scares Scrambler stuff will
happen (at least, in it's current form).

Current Release Build: 20

Current Beta Build: 9+10
Current Beta Build: 22

Currently Planned Features: A bunch, but Scare'm not writing them right now.
Currently Planned Features: A bunch, but Scare'm not writing them
right now.

# What need?

- Python3
- [Python >=3.5][1]
- Tkinter (comes with all prebuilt versions of Python)
- Pyinstaller (optional, for building)
- [Pyinstaller][2] (optional, for building)
- Some form of 7-zip (optional, for building)
- GNU make (optional, for building on Linux)

`pip3 install pyinstaller`
[1]: https://www.python.org/
[2]: https://www.pyinstaller.org/

If you're running Python 3.8, as of now you need to install the
*development* version of Pyinstaller for the build to work at all:
```bash
# Install Pyinstaller (not system dependent):
pip3 install pyinstaller

`pip3 install https://github.com/pyinstaller/pyinstaller/archive/develop.tar.gz`
# Install p7zip (Arch/Manjaro Linux):
sudo pacman -Sy p7zip

# Install p7zip (Debian/Ubuntu Linux):
sudo apt-get update
sudo apt-get install p7zip-full p7zip-rar
```

# How run without build?

```
python3 Scares_Scrambler_Class_Rebuild.py
python3 Scrambler.py
```

# How build?

```
pyinstaller Scares_Scrambler_Class_Rebuild.py -w -F -i Assets/favi.ico
```
## Linux

Open the console of your choice, and navigate to where you
have extracted a source .zip file or whereever you have
cloned the repository.

Running `make` will create a `Release.zip` file that contains
a binary and `Assets`.

## Windows

Using GNU make is a bit harder on Windows, so Scott've included
a `build.cmd` file.

Install [7-Zip][3] and add it to the `PATH`:

- Press Windows+R, type `sysdm.cpl`, and press enter.
- Click on the `Advanced` tab.
- Click on the `Environment Variables...` button.
- Add or edit the `PATH` variable **for your user**
(under "User variables") to include
`C:\Program Files\7-Zip` or `C:\Program Files (x86)\7-Zip`.

(this only has to be done once per system.)

[3]: https://7-zip.org/download.html

Double-clicking `build.cmd` will now create a `Release.zip`
file that contains a binary and `Assets`.
8 changes: 4 additions & 4 deletions Scares_Scrambler_Class_Rebuild.py → Scrambler.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,14 @@
from tkinter import (Tk, messagebox, ttk)
from tkinter.filedialog import askopenfilename

from Engine_Class_File import * #Import all the important classes I made haha
from Theme_Class_File import *
from Engine import * #Import all the important classes I made haha
from Themes import *

'''Hello, anyone reading this! Don't mind the disgusting code in some places; I'm not that good at coding, so don't expect it to work perfectly
and/or look pretty! Anyways, hopefully you'll find some enjoyment messing around with this corrupter. Have fun!'''

buildNumber = "9+10"
versionNumber = "v1.2121"
buildNumber = "22"
versionNumber = "v1.22"
goodIcon = "Assets/favi.ico"

#os.getcwd() to get working directory
Expand Down
File renamed without changes.
3 changes: 3 additions & 0 deletions build.cmd
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
@echo off
pyinstaller Scrambler.py -w -F -i Assets/favi.ico
7z a Release.zip ./dist/* Assets

0 comments on commit dc3e78c

Please sign in to comment.