diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 0000000..4b630ad --- /dev/null +++ b/.travis.yml @@ -0,0 +1,29 @@ +services: + - docker + +before_install: +- docker pull makeappdev/uselatex +- docker run -it -d --name uselatex makeappdev/uselatex bash +- docker ps -a +- docker exec uselatex bash -c "cmake --version; pdflatex --version" +- docker cp ./. uselatex:/ + +script: +- docker exec uselatex bash -c "mkdir -p build && cd build && cmake ..; make" +- mkdir -p export +- mkdir -p tmp +- echo "# This branch is for deployment only" >> export/README.md +- docker cp uselatex:build/. tmp +- cp tmp/*.pdf export +- cp tmp/git.id export + +deploy: + provider: pages + skip-cleanup: true + github-token: $GITHUB_TOKEN # Set in travis-ci.org dashboard, marked secure + local-dir: export + on: + branch: master + +notifications: + email: false diff --git a/CMakeLists.txt b/CMakeLists.txt index 39fe358..e0281a3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -4,53 +4,49 @@ project(FS NONE) include(UseLATEX) add_custom_target( - writegitid ALL - COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/write-gitid.sh - WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} + writegitid ALL + COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/write-gitid.sh + WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} ) set(CHAPTERS - chapters/grundlagen.tex - chapters/permanentmagnete.tex - chapters/gleichstrommaschine.tex - chapters/wechselfeld.tex - chapters/synchronmaschine.tex - chapters/asynchronmaschine.tex - chapters/universalmaschine.tex + chapters/grundlagen.tex + chapters/permanentmagnete.tex + chapters/gleichstrommaschine.tex + chapters/wechselfeld.tex + chapters/synchronmaschine.tex + chapters/asynchronmaschine.tex + chapters/universalmaschine.tex ) set(DRAWINGS - drawings/grundlagen/maschinen-querschnitt.tex - drawings/grundlagen/maschinen-querschnitt2.tex - drawings/permanentmagnete/gsm_querschnitt.tex - drawings/gleichstrommaschine/flussverlauf_phi.tex - drawings/gleichstrommaschine/gsnsm_esb.tex - drawings/gleichstrommaschine/gsrsm_esb.tex - drawings/gleichstrommaschine/esb_pgsm.tex - drawings/synchronmaschine/sm_esb.tex - drawings/synchronmaschine/zeiger_syn.tex - drawings/synchronmaschine/zeiger_syn_dq.tex - drawings/synchronmaschine/zeiger_syn_generatorbetrieb.tex - drawings/synchronmaschine/zeiger_syn_motorbetrieb.tex - drawings/synchronmaschine/zeiger_syn_stromortskurve.tex - drawings/asynchronmaschine/asm_esb.tex - drawings/asynchronmaschine/zeiger_asyn.tex - drawings/asynchronmaschine/zeiger_asyn_stromortskurve_i.tex - drawings/asynchronmaschine/zeiger_asyn_stromortskurve_p.tex - drawings/asynchronmaschine/zeiger_asyn_stromortskurve_s.tex - drawings/universalmaschine/esb_uvm.tex - drawings/universalmaschine/zeiger_uvm_stromortskurve.tex - drawings/universalmaschine/zeiger_uvm.tex -) - -set(IMAGES - img/Logo.pdf + drawings/grundlagen/maschinen-querschnitt.tex + drawings/grundlagen/maschinen-querschnitt2.tex + drawings/permanentmagnete/gsm_querschnitt.tex + drawings/gleichstrommaschine/flussverlauf_phi.tex + drawings/gleichstrommaschine/gsnsm_esb.tex + drawings/gleichstrommaschine/gsrsm_esb.tex + drawings/gleichstrommaschine/esb_pgsm.tex + drawings/synchronmaschine/sm_esb.tex + drawings/synchronmaschine/zeiger_syn.tex + drawings/synchronmaschine/zeiger_syn_dq.tex + drawings/synchronmaschine/zeiger_syn_generatorbetrieb.tex + drawings/synchronmaschine/zeiger_syn_motorbetrieb.tex + drawings/synchronmaschine/zeiger_syn_stromortskurve.tex + drawings/asynchronmaschine/asm_esb.tex + drawings/asynchronmaschine/zeiger_asyn.tex + drawings/asynchronmaschine/zeiger_asyn_stromortskurve_i.tex + drawings/asynchronmaschine/zeiger_asyn_stromortskurve_p.tex + drawings/asynchronmaschine/zeiger_asyn_stromortskurve_s.tex + drawings/universalmaschine/esb_uvm.tex + drawings/universalmaschine/zeiger_uvm_stromortskurve.tex + drawings/universalmaschine/zeiger_uvm.tex ) add_latex_document( - formelsammlung.tex - FORCE_PDF - INPUTS ${CHAPTERS} ${DRAWINGS} - IMAGES ${IMAGES} - DEPENDS writegitid + formelsammlung.tex + FORCE_PDF + IMAGE_DIRS img + INPUTS ${CHAPTERS} ${DRAWINGS} + DEPENDS writegitid ) diff --git a/README.md b/README.md index 158e222..95a2cf3 100644 --- a/README.md +++ b/README.md @@ -1,17 +1,13 @@ -# Elektrische Kleinmaschinen -[![wercker status](https://app.wercker.com/status/d4cb3c1da011db50fd8bfceb7e5932e3/s "wercker status")](https://app.wercker.com/project/bykey/d4cb3c1da011db50fd8bfceb7e5932e3) - +# Elektrische Kleinmaschinen + +[![Build Status](https://travis-ci.org/MaKeAppDev/FS-EKM.svg?branch=master)](https://travis-ci.org/MaKeAppDev/FS-EKM) +[![Join the chat at https://gitter.im/LaTeX4Ei/Lobby](https://badges.gitter.im/LaTeX4Ei/Lobby.svg)](https://gitter.im/LaTeX4Ei/Lobby?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) + ## Formelsammlung für Latex4ei -**Required custom Package on GitHub:** [LaTeX4Ei](https://github.com/latex4ei/latex4ei-packages) - -### Links -Fresh Development Version: [TUM-Projekte](https://makeappdev.github.io/TUM-Projekte/) -Public Version: [latex4ei.de](http://latex4ei.de) +**Required custom Package on GitHub:** [LaTeX4Ei](https://github.com/latex4ei/latex4ei-packages) -## Written by -- Hofbauer, Markus -- Meyer, Kevin +Public Version: [latex4ei.de](http://latex4ei.de) or [TUM-Projekte](https://makeappdev.github.io/TUM-Projekte/) -------------------------------------- @@ -28,12 +24,17 @@ pull from upstream: -------------------------------------- ## Optional: Build with CMake -Download [UseLaTeX.cmake](https://cmake.org/Wiki/CMakeUserUseLATEX) and move to `/usr/share/cmake-X.X/Modules/.` -##### Steps to build: +Download [UseLaTeX.cmake](https://cmake.org/Wiki/CMakeUserUseLATEX) and move to `/usr/share/cmake-X.X/Modules/.` + ```shell mkdir build cd build cmake .. make ``` + +## Written by + +- Hofbauer, Markus +- Meyer, Kevin diff --git a/wercker.yml b/wercker.yml deleted file mode 100644 index 739604c..0000000 --- a/wercker.yml +++ /dev/null @@ -1,42 +0,0 @@ -box: makeappdev/uselatex -# Build definition -build: - # The steps that will be executed on build - steps: - - script: - name: check setup - code: | - echo $PATH - pdflatex --version - - script: - name: generate pdf - code: | - mkdir -p build - cd build - cmake .. - make - after-steps: - # Use the build results - - script: - name: saving pdf - code: | - cp build/*.pdf $WERCKER_REPORT_ARTIFACTS_DIR - -deploy: - steps: - - add-to-known_hosts: - hostname: lootsch.cetus.uberspace.de - - mktemp: - envvar: PRIVATEKEY_PATH - - create-file: - name: write key - filename: $PRIVATEKEY_PATH - content: $sshkey_PRIVATE - overwrite: true - hide-from-log: true - - script: - name: deploy pdf - code: | - pwd - ls -la - scp -i $PRIVATEKEY_PATH -o StrictHostKeyChecking=no -o UserKnownHostsFile=no build/formelsammlung.pdf lootsch@lootsch.cetus.uberspace.de:~/html/latex/$WERCKER_APPLICATION_NAME.pdf