Fixed release build

edomora97 · edomora97 · commit c4e1d7e48358 · 2018-09-07T00:51:29.000+02:00
diff --git a/.travis.yml b/.travis.yml
@@ -13,7 +13,7 @@ matrix:
         - TOOLCHAIN=archlinux
 #    - os: osx
 #      env:
-#        - DEPLOY=1
+#        - TOOLCHAIN=osx
 #      install:
 #        - brew upgrade python wget cmake
 #        - brew install rust
@@ -61,11 +61,11 @@ before_deploy:
       /build/tools/make_release.sh
 
 deploy:
-  provider: releases
-  api_key:
-    secure: HVF8CkBTelG3qd0R9D8ODEwzYcwU8Sk7wKZ5vDTZajdqSFcHllJfY8UUBJQ2iXH1a2Q9vFqcbd+O44mvKyk/6KGg5xfoxgo4SQvXqvQ/s9AsrMEEOOT/++MMwDEZM6NCSL6CvoH9EOGRw6Dd+XEgS2EiotgvvTi3W9oeq3/qt7UqPqxVgTcqY4ZdIsEHDwPcjcd/B8YZ9G4aq/gRWHoS9OD5exfsMWd+FbN/BD00QJxzVz96IrPXu80d7HpTis34ROO1D+tSBNBqTovfHwTa1A99LLygismY70BofXwrxuanFQH4Jq3kXvMnmZCHFYFqdAw2k5y49yJTwlkf4gmwXQXDfHsos+fSdm5xmuEpUT2asW+riWYcyQ9s0ygZx7FBa3fgamiBSxaP5ogwWX2k41IqV/nPp5S9uATaquyBgSTEQga6xQP68+1igpWi/na77DkH3QS3Fa4UMs6Lef1QTiUkNDSXwdLXV0ljrr3wye6vqz1g6C9/7lPF3Nm5uDy/mYjqZdF/H2mjg+G9smEkSI1/xciDJaTZRxly+SEZRoo1FX7Gk0e58EDgCXHI7Kb8X7ju82hHFpCIgzqDbfxAnmWujBRhy4Qka2wHnezAKOOu7zWqpDUPabcMXg/6eMWtj5h63YAXsalrkYwV4gtyzhOmtICT4MfhzzU0/DmU84U=
-  file: build_rel/python/task-maker-$TRAVIS_TAG-$TRAVIS_OS_NAME.zip
-  skip_cleanup: true
-  on:
-    tags: true
-    condition: "$DEPLOY = 1"
+  - provider: releases
+    api_key:
+      secure: HVF8CkBTelG3qd0R9D8ODEwzYcwU8Sk7wKZ5vDTZajdqSFcHllJfY8UUBJQ2iXH1a2Q9vFqcbd+O44mvKyk/6KGg5xfoxgo4SQvXqvQ/s9AsrMEEOOT/++MMwDEZM6NCSL6CvoH9EOGRw6Dd+XEgS2EiotgvvTi3W9oeq3/qt7UqPqxVgTcqY4ZdIsEHDwPcjcd/B8YZ9G4aq/gRWHoS9OD5exfsMWd+FbN/BD00QJxzVz96IrPXu80d7HpTis34ROO1D+tSBNBqTovfHwTa1A99LLygismY70BofXwrxuanFQH4Jq3kXvMnmZCHFYFqdAw2k5y49yJTwlkf4gmwXQXDfHsos+fSdm5xmuEpUT2asW+riWYcyQ9s0ygZx7FBa3fgamiBSxaP5ogwWX2k41IqV/nPp5S9uATaquyBgSTEQga6xQP68+1igpWi/na77DkH3QS3Fa4UMs6Lef1QTiUkNDSXwdLXV0ljrr3wye6vqz1g6C9/7lPF3Nm5uDy/mYjqZdF/H2mjg+G9smEkSI1/xciDJaTZRxly+SEZRoo1FX7Gk0e58EDgCXHI7Kb8X7ju82hHFpCIgzqDbfxAnmWujBRhy4Qka2wHnezAKOOu7zWqpDUPabcMXg/6eMWtj5h63YAXsalrkYwV4gtyzhOmtICT4MfhzzU0/DmU84U=
+    # TODO add the support for the different file names
+    file: build_rel/python/task-maker-${TRAVIS_TAG}_${TOOLCHAIN}_amd64.deb
+    skip_cleanup: true
+    on:
+      tags: true
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -48,6 +48,9 @@ include(GoogleTest)
 
 find_package(PythonInterp 3.5 REQUIRED)
 
+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/tools/DEBIAN/control.in
+               ${CMAKE_CURRENT_BINARY_DIR}/DEBIAN/control)
+
 # Enable colors in ninja
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fdiagnostics-color=always") 
 # Other flags
diff --git a/python/uis/terry_curses_ui.py b/python/uis/terry_curses_ui.py
@@ -1,4 +1,4 @@
-#!/usr/local/bin python3
+#!/usr/bin/env python3
 from task_maker.printer import CursesPrinter
 from task_maker.uis import CursesUI, get_max_sol_len
 from task_maker.uis.ioi_curses_ui import print_compilation_status
diff --git a/tools/DEBIAN/control.in b/tools/DEBIAN/control.in
@@ -0,0 +1,8 @@
+Package: task-maker
+Version: ${GIT_LAST_VERSION}
+Architecture: amd64
+Depends: libc6, libdw1, libgcc1, libstdc++6, build-essential, python3, python3-traits, python3-ruamel.yaml
+Maintainer: Edoardo Morassutto <edoardo.morassutto@gmail.com>
+Homepage: https://github.com/algorithm-ninja/task-maker
+Description: The new cmsMake!
+ The new cmsMake!
diff --git a/tools/make_release.sh b/tools/make_release.sh
@@ -1,21 +1,35 @@
 #!/usr/bin/env bash
 
-if [ "$TRAVIS_OS_NAME" == "linux" ]; then
-    source /venv/bin/activate
-else
-    source /tmp/venv/bin/activate
-fi
+set -ex
 
-cmake -H. -Bbuild_rel -DHUNTER_ROOT=hunter-root -DCMAKE_BUILD_TYPE=Release
-
-cmake --build build_rel
+if [ "$CI" != "true" ]; then
+    echo "This script is supposed to run on the CI, it may break your system"
+    exit 1
+fi
 
-if [ "$TRAVIS_OS_NAME" == "linux" ]; then
-    strip -s build_rel/python/task_maker/bin/task-maker
-else
+if [ "$TOOLCHAIN" == "archlinux" ]; then
+    # TODO pull from aur.archlinux.org the PKGBUILD and build the package from
+    # that
+    echo "Release not supported yet"
+elif [ "$TOOLCHAIN" == "osx" ]; then
+    source /tmp/venv/bin/activate
+    cmake -H. -Bbuild_rel -DHUNTER_ROOT=hunter-root -DCMAKE_BUILD_TYPE=Release
+    cmake --build build_rel
     strip build_rel/python/task_maker/bin/task-maker
+    # TODO strip the frontend?
+    chmod +x build_rel/python/setup.py
+    # TODO build something?
+else
+    cmake -H. -Bbuild_rel -DHUNTER_ROOT=hunter-root -DCMAKE_BUILD_TYPE=Release
+    cmake --build build_rel
+    strip -s build_rel/python/task_maker/bin/task-maker
+    strip -s build_rel/python/task_maker/task_maker_frontend.so
+    chmod +x build_rel/python/setup.py
+    cd build_rel/python
+    ./setup.py install --root=root --prefix=/usr --optimize=1
+    find root -name __pycache__ -exec rm -rv "{}" +
+    find -name site-packages | sed -e "p;s/site/dist/" | xargs -n2 mv
+    cp -r ../DEBIAN root
+    dpkg-deb --build root task-maker-${TRAVIS_TAG}_${TOOLCHAIN}_amd64.deb
+    lintian task-maker-${TRAVIS_TAG}_${TOOLCHAIN}_amd64.deb -i || true
 fi
-
-chmod +x build_rel/python/setup.py
-
-( cd build_rel/python && zip -r task-maker-$TRAVIS_TAG-$TRAVIS_OS_NAME.zip requirements.txt setup.py task_maker )

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-#!/usr/local/bin python3`
	`1`	`+#!/usr/bin/env python3`
`2`	`2`	`from task_maker.printer import CursesPrinter`
`3`	`3`	`from task_maker.uis import CursesUI, get_max_sol_len`
`4`	`4`	`from task_maker.uis.ioi_curses_ui import print_compilation_status`