Move around and cleanup main directory

Author: jyapayne

build_command_line_linux.bash

@@ -8,7 +8,7 @@
     pass
 
 from utils import zip_files, join_files, log, get_temp_dir
-from pycns import save_icns
+from image_utils.pycns import save_icns
 from pepy.pe import PEFile
 
 import argparse

build_mac.bash

@@ -1,6 +1,6 @@
 import struct
-import image_utils
-import png
+import image_utils.image_utils as image_utils
+import image_utils.png as png
 from PIL import Image
 import os
 from io import BytesIO

build_mac_setup.py

@@ -1,5 +1,5 @@
-from icns_info import ICNSHeader, icns_to_png
-from image_utils import Image
+from image_utils.icns_info import ICNSHeader, icns_to_png
+from image_utils.image_utils import Image
 import sys
 
 """This module takes any image that is readable by PIL and exports it to an icns file.

build_windows.bat

@@ -14,7 +14,7 @@
 from PySide.QtNetwork import QHttp
 from PySide.QtCore import QUrl, QFile, QIODevice, QCoreApplication
 
-from pycns import pngs_from_icns
+from image_utils.pycns import pngs_from_icns
 from command_line import CommandBase, logger, get_file
 from command_line import __version__ as __gui_version__
 

command_line.py

@@ -0,0 +1,72 @@
+DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+
+README=""
+PROJ_DIR=$DIR
+
+while [[ -z $README ]] && [[ $PROJ_DIR != "/" ]]; do
+    README=$(find $PROJ_DIR -maxdepth 1 -name "README.md")
+
+    if [[ -z $README ]]; then
+        PROJ_DIR="$(dirname $PROJ_DIR)"
+    fi
+done
+
+if [[ $PROJ_DIR == "/" ]]; then
+    echo "No suitable project directory was found. Exiting."
+    exit 1
+fi
+
+BUILD_DIR="$PROJ_DIR/Web2ExeBuild"
+
+## Remove old build directories
+rm -rf $PROJ_DIR/build $BUILD_DIR
+
+VERSION=$(cat $PROJ_DIR/files/version.txt)
+
+################# Build CMD Version ###################
+
+pyinstaller --onefile --exclude-module PyQt5 --exclude-module PyQt4 \
+            --hidden-import PIL.Jpeg2KImagePlugin \
+            --hidden-import pkg_resources \
+            --hidden-import PIL._imaging \
+            --hidden-import configobj \
+            --distpath $BUILD_DIR/Web2ExeLinux-CMD \
+            -n web2exe-linux $PROJ_DIR/command_line.py
+
+cp -rf $PROJ_DIR/files $BUILD_DIR/Web2ExeLinux-CMD/files
+
+## Remove any unneeded files
+rm -rf $BUILD_DIR/Web2ExeLinux-CMD/files/downloads/*
+rm $BUILD_DIR/Web2ExeLinux-CMD/files/error.log \
+   $BUILD_DIR/Web2ExeLinux-CMD/files/last_project_path.txt \
+   $BUILD_DIR/Web2ExeLinux-CMD/files/recent_files.txt \
+   $BUILD_DIR/Web2ExeLinux-CMD/files/compressors/upx-mac \
+   $BUILD_DIR/Web2ExeLinux-CMD/files/compressors/upx-win.exe
+
+################# Build GUI Version ###################
+
+pyinstaller -F --exclude-module PyQt5 --exclude-module PyQt4 \
+            --hidden-import PIL.Jpeg2KImagePlugin \
+            --hidden-import configobj \
+            --hidden-import PIL._imaging \
+            --hidden-import pkg_resources \
+            -n web2exe --distpath $BUILD_DIR/Web2ExeLinux $PROJ_DIR/main.py
+
+## Copy the files directory over
+cp -rf $PROJ_DIR/files $BUILD_DIR/Web2ExeLinux/files
+
+## Remove any unneeded files
+rm -rf $BUILD_DIR/Web2ExeLinux/files/downloads/*
+rm $BUILD_DIR/Web2ExeLinux/files/error.log \
+   $BUILD_DIR/Web2ExeLinux/files/last_project_path.txt \
+   $BUILD_DIR/Web2ExeLinux/files/recent_files.txt \
+   $BUILD_DIR/Web2ExeLinux/files/compressors/upx-mac \
+   $BUILD_DIR/Web2ExeLinux/files/compressors/upx-win.exe
+
+
+################# Zip and Upload to Github ###################
+
+zip -r -9 $BUILD_DIR/Web2ExeLinux-CMD.zip $BUILD_DIR/Web2ExeLinux-CMD/*
+zip -r -9 $BUILD_DIR/Web2ExeLinux-${VERSION}.zip $BUILD_DIR/Web2ExeLinux
+
+python3.4 $DIR/upload_release.py

image_tool_build.bash

@@ -0,0 +1,81 @@
+DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+
+README=""
+PROJ_DIR=$DIR
+
+while [[ -z $README ]] && [[ $PROJ_DIR != "/" ]]; do
+    README=$(find $PROJ_DIR -maxdepth 1 -name "README.md")
+
+    if [[ -z $README ]]; then
+        PROJ_DIR="$(dirname $PROJ_DIR)"
+    fi
+done
+
+if [[ $PROJ_DIR == "/" ]]; then
+    echo "No suitable project directory was found. Exiting."
+    exit 1
+fi
+
+BUILD_DIR="$PROJ_DIR/Web2ExeBuild"
+
+## Remove old build directories
+rm -rf $PROJ_DIR/build $BUILD_DIR
+
+VERSION=$(cat $PROJ_DIR/files/version.txt)
+
+################# Build CMD Version ###################
+
+pyinstaller --hidden-import PIL.Jpeg2KImagePlugin \
+            --hidden-import configobj \
+            --hidden-import pkg_resources \
+            --distpath $BUILD_DIR/Web2ExeMac-CMD \
+            --onefile -n web2exe-mac $PROJ_DIR/command_line.py
+
+CMD_FILES_DIR=$BUILD_DIR/Web2ExeMac-CMD/files
+
+cp -rf $PROJ_DIR/files $CMD_FILES_DIR
+
+rm -rf $CMD_FILES_DIR/downloads/*
+rm $CMD_FILES_DIR/error.log \
+   $CMD_FILES_DIR/last_project_path.txt \
+   $CMD_FILES_DIR/recent_files.txt \
+   $CMD_FILES_DIR/compressors/upx-linux-x64 \
+   $CMD_FILES_DIR/compressors/upx-linux-x32 \
+   $CMD_FILES_DIR/compressors/upx-win.exe
+
+rm -rf $PROJ_DIR/build $PROJ_DIR/dist
+
+################# Build GUI Version ###################
+
+pyinstaller -w --hidden-import PIL.Jpeg2KImagePlugin \
+               --hidden-import PyQt4 \
+               --hidden-import PIL \
+               --hidden-import configobj \
+               --hidden-import pkg_resources \
+               --distpath $BUILD_DIR/ \
+               --onefile -n Web2Executable $PROJ_DIR/main.py
+
+FILES_DIR=$BUILD_DIR/Web2Executable.app/Contents/MacOS/files
+
+cp $PROJ_DIR/images/icon.icns $BUILD_DIR/Web2Executable.app/Contents/Resources/icon-windowed.icns
+cp -rf files $FILES_DIR
+
+rm -rf $FILES_DIR/downloads/*
+rm $FILES_DIR/error.log \
+   $FILES_DIR/last_project_path.txt \
+   $FILES_DIR/recent_files.txt \
+   $FILES_DIR/compressors/upx-linux-x64 \
+   $FILES_DIR/compressors/upx-linux-x32 \
+   $FILES_DIR/compressors/upx-win.exe
+
+rm -rf $PROJ_DIR/build $PROJ_DIR/dist
+
+################# Zip and Upload to Github ###################
+
+/Applications/Keka.app/Contents/Resources/keka7z a -r \
+    Web2ExeMac-CMD.zip $BUILD_DIR/Web2ExeMac-CMD
+
+/Applications/Keka.app/Contents/Resources/keka7z a -r \
+    Web2ExeMac-${VERSION}.zip $BUILD_DIR/Web2Executable.app
+
+python3.4 $DIR/upload_release.py

image_tool_build.bat

@@ -0,0 +1,42 @@
+rd /S /Q Web2ExeWin
+del *.zip
+call pyinstaller --onefile ^
+ --hidden-import PIL.Jpeg2KImagePlugin ^
+ --hidden-import configobj ^
+ --hidden-import pkg_resources ^
+ -i images\icon.ico ^
+ --distpath Web2ExeWin-CMD ^
+ -n web2exe-win command_line.py
+
+rd /S /Q Web2ExeWin-CMD\files
+echo D | xcopy /s files Web2ExeWin-CMD\files
+
+
+call pyinstaller -w --onefile ^
+ --hidden-import PIL.Jpeg2KImagePlugin ^
+ --hidden-import pkg_resources ^
+ --hidden-import configobj ^
+ -i icon.ico ^
+ --distpath Web2ExeWin -n Web2Exe main.py
+
+echo D | xcopy /s files Web2ExeWin\files
+
+del Web2ExeWin\files\compressors\upx-mac
+del Web2ExeWin\files\compressors\upx-linux-x64
+del Web2ExeWin\files\compressors\upx-linux-x32
+
+del Web2ExeWin-CMD\files\compressors\upx-mac
+del Web2ExeWin-CMD\files\compressors\upx-linux-x64
+del Web2ExeWin-CMD\files\compressors\upx-linux-x32
+
+makensis /V4 scripts/Web2Exe.nsi
+
+set /p Version=<files\version.txt
+
+7z a Web2ExeWin-%Version%.zip -r Web2ExeWin
+cd Web2ExeWin-CMD
+7z a ..\Web2ExeWin-CMD.zip -tzip -r *
+cd ..
+7z a Web2ExeWin-Setup.zip Web2Exe-Setup.exe
+
+call python scripts/upload_release.py