From 1889d8c88fe857ed07f3c8718886084d1862caea Mon Sep 17 00:00:00 2001 From: tzutalin Date: Fri, 21 Jul 2017 22:26:21 +0800 Subject: [PATCH] Add README for build-tools --- build-tools/README.md | 30 +++++++++++++++++++++++++++ build-tools/build-for-pypi.sh | 15 -------------- build-tools/build-ubuntu-binary.sh | 24 ---------------------- build-tools/build-windows-binary.sh | 32 ----------------------------- build-tools/run-in-container.sh | 12 ++++++++++- 5 files changed, 41 insertions(+), 72 deletions(-) create mode 100644 build-tools/README.md delete mode 100755 build-tools/build-for-pypi.sh delete mode 100755 build-tools/build-ubuntu-binary.sh delete mode 100755 build-tools/build-windows-binary.sh diff --git a/build-tools/README.md b/build-tools/README.md new file mode 100644 index 00000000..4df60842 --- /dev/null +++ b/build-tools/README.md @@ -0,0 +1,30 @@ +### Deploy to PyPI + +``` +cd [ROOT] +sh build-tools/build-for-pypi.sh +``` + + +### Build for Ubuntu + +``` +cd build-tools +sh run-in-container.sh +sh envsetup.sh +sh build-ubuntu-binary.sh +``` + +### Build for Windows + +``` +cd build-tools +sh run-in-container.sh +sh envsetup.sh +sh build-windows-binary.sh +``` + +Note: If there are some problems, try to +``` +sudo rm -rf virtual-wne venv_wine +``` diff --git a/build-tools/build-for-pypi.sh b/build-tools/build-for-pypi.sh deleted file mode 100755 index 2d0c1d71..00000000 --- a/build-tools/build-for-pypi.sh +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/sh -# Packaging and Release -docker run --workdir=$(pwd)/ --volume="/home/$USER:/home/$USER" tzutalin/py2qt4 /bin/sh -c 'sudo python setup.py sdist;sudo python setup.py install' - -while true; do - read -p "Do you wish to deploy this to PyPI?" yn - case $yn in - [Yy]* ) docker run -it --rm --workdir=$(pwd)/ --volume="/home/$USER:/home/$USER" tzutalin/py2qt4; break;; - [Nn]* ) exit;; - * ) echo "Please answer yes or no.";; - esac -done -# python setup.py register -# python setup.py sdist upload -# Net pypi: twine upload dist/* diff --git a/build-tools/build-ubuntu-binary.sh b/build-tools/build-ubuntu-binary.sh deleted file mode 100755 index dbe53028..00000000 --- a/build-tools/build-ubuntu-binary.sh +++ /dev/null @@ -1,24 +0,0 @@ -#!/bin/bash -### Ubuntu use pyinstall v3.0 -THIS_SCRIPT_PATH=`readlink -f $0` -THIS_SCRIPT_DIR=`dirname ${THIS_SCRIPT_PATH}` -cd pyinstaller -git checkout v3.2 -cd ${THIS_SCRIPT_DIR} - -rm -r build -rm -r dist -rm labelImg.spec -python pyinstaller/pyinstaller.py --hidden-import=xml \ - --hidden-import=xml.etree \ - --hidden-import=xml.etree.ElementTree \ - --hidden-import=lxml.etree \ - -D -F -n labelImg -c "../labelImg.py" -p ../libs -p ../ - -FOLDER=$(git describe --abbrev=0 --tags) -FOLDER="linux_"$FOLDER -rm -rf "$FOLDER" -mkdir "$FOLDER" -cp dist/labelImg $FOLDER -cp -rf ../data $FOLDER/data -zip "$FOLDER.zip" -r $FOLDER diff --git a/build-tools/build-windows-binary.sh b/build-tools/build-windows-binary.sh deleted file mode 100755 index 566e88f9..00000000 --- a/build-tools/build-windows-binary.sh +++ /dev/null @@ -1,32 +0,0 @@ -#!/bin/bash -### Window requires pyinstall v2.1 -wine msiexec -i python-2.7.8.msi -wine pywin32-218.win32-py2.7.exe -wine PyQt4-4.11.4-gpl-Py2.7-Qt4.8.7-x32.exe -wine lxml-3.7.3.win32-py2.7.exe - -THIS_SCRIPT_PATH=`readlink -f $0` -THIS_SCRIPT_DIR=`dirname ${THIS_SCRIPT_PATH}` -cd pyinstaller -git checkout v2.1 -cd ${THIS_SCRIPT_DIR} -echo ${THIS_SCRIPT_DIR} - -#. venv_wine/bin/activate -rm -r build -rm -r dist -rm labelImg.spec - -wine c:/Python27/python.exe pyinstaller/pyinstaller.py --hidden-import=xml \ - --hidden-import=xml.etree \ - --hidden-import=xml.etree.ElementTree \ - --hidden-import=lxml.etree \ - -D -F -n labelImg -c "../labelImg.py" -p ../libs -p ../ - -FOLDER=$(git describe --abbrev=0 --tags) -FOLDER="windows_"$FOLDER -rm -rf "$FOLDER" -mkdir "$FOLDER" -cp dist/labelImg.exe $FOLDER -cp -rf ../data $FOLDER/data -zip "$FOLDER.zip" -r $FOLDER diff --git a/build-tools/run-in-container.sh b/build-tools/run-in-container.sh index 22c1beb9..980699d6 100755 --- a/build-tools/run-in-container.sh +++ b/build-tools/run-in-container.sh @@ -1,3 +1,13 @@ #!/bin/sh -docker run -it --rm --workdir=$(pwd)/ --volume="/home/$USER:/home/$USER" tzutalin/py2qt4 +docker run -it \ + --user $(id -u) \ + -e DISPLAY=unix$DISPLAY \ + --workdir=$(pwd) \ + --volume="/home/$USER:/home/$USER" \ + --volume="/etc/group:/etc/group:ro" \ + --volume="/etc/passwd:/etc/passwd:ro" \ + --volume="/etc/shadow:/etc/shadow:ro" \ + --volume="/etc/sudoers.d:/etc/sudoers.d:ro" \ + -v /tmp/.X11-unix:/tmp/.X11-unix \ + tzutalin/py2qt4