Skip to content

Commit 81ccadb

Browse files
metaphorimetaphori
authored
Merge pull request #7 from APICe-at-DISI/feature/lab02
Fixes pre-Lab02
2 parents 4875ef2 + 316094e commit 81ccadb

File tree

4 files changed

+130
-107
lines changed

4 files changed

+130
-107
lines changed

‎.travis.yml

Lines changed: 124 additions & 105 deletions
Original file line numberDiff line numberDiff line change
@@ -1,105 +1,124 @@
1-
# Do not double-build branches and PRs from this repo
2-
# Do not build auto-tagged versions
3-
if: repo != head_repo AND tag !~ /^[\w\.]+-\d+-\w+/
4-
5-
env:
6-
global:
7-
- TERM=dumb
8-
- GRAVIS_REPO="https://github.com/DanySK/Gravis-CI.git"
9-
- GRAVIS="$HOME/gravis"
10-
11-
language: java
12-
os: linux
13-
dist: focal
14-
addons:
15-
apt:
16-
sources:
17-
- sourceline: 'deb [arch=amd64] http://miktex.org/download/ubuntu focal universe'
18-
key_url: "http://keyserver.ubuntu.com/pks/lookup?op=get&search=miktex"
19-
update: true
20-
packages:
21-
# LaTeX decent font processor
22-
- cm-super
23-
# Image processing
24-
- inkscape
25-
# DOT and GV support
26-
- graphviz
27-
# Tikz support
28-
- gnuplot
29-
# Color profiles support
30-
- icc-profiles
31-
# Better PS support
32-
- ghostscript
33-
# For git latexdiff
34-
- latexdiff
35-
# For Minted
36-
- python-pygments
37-
- python3-pygments
38-
# LaTeX
39-
- miktex
40-
# Debug
41-
- tree
42-
install:
43-
- travis_retry git clone --depth 1 $GRAVIS_REPO $GRAVIS
44-
- sudo miktexsetup --shared=yes finish
45-
- sudo initexmf --admin --set-config-value [MPM]AutoInstall=1
46-
- sudo mpm --admin --package-level=basic --find-upgrades --upgrade
47-
48-
before_script:
49-
# Debug prints
50-
- pygmentize -V # debug
51-
- inkscape --version # debug
52-
- gs --version
53-
- dot -V
54-
55-
script:
56-
- cd slides
57-
- chmod +x gradlew
58-
- ./gradlew buildLatex
59-
60-
after_script:
61-
- git checkout master
62-
- git add gradlew
63-
- git commit -m "[ci skip] [automatic] Make gradlew executable again"
64-
- git push "[email protected]:${TRAVIS_REPO_SLUG}.git" master
65-
66-
after_success:
67-
- git config --local user.name "Danilo Pianini's Travis CI automation bot"
68-
- git config --local user.email "[email protected]"
69-
70-
before_deploy:
71-
- $GRAVIS/autotag
72-
- cd $TRAVIS_BUILD_DIR/workspace
73-
# zip all workspace/* folders
74-
- for i in */; do zip -r "${i%/}.zip" "$i"; done
75-
76-
deploy:
77-
- provider: releases
78-
edge: true
79-
repo: "APICe-at-DISI/OOP-lab-public"
80-
on:
81-
all_branches: true
82-
condition: $TRAVIS_BRANCH = master || $TRAVIS_TAG != ""
83-
file:
84-
- "$TRAVIS_BUILD_DIR/slides/00 - intro/00-intro.pdf"
85-
- "$TRAVIS_BUILD_DIR/slides/01 - java-basic-tools/01-basic-tools.pdf"
86-
- "$TRAVIS_BUILD_DIR/slides/02 - java-advanced-tools/02-advanced-tools.pdf"
87-
- "$TRAVIS_BUILD_DIR/slides/03 - eclipse/03-eclipse.pdf"
88-
- "$TRAVIS_BUILD_DIR/slides/04 - dvcs-1/04-git-intro.pdf"
89-
- "$TRAVIS_BUILD_DIR/slides/05 - dvcs-2/05-branching-merging.pdf"
90-
- "$TRAVIS_BUILD_DIR/slides/06 - dvcs-testing/06-DVCS3-junit.pdf"
91-
- "$TRAVIS_BUILD_DIR/slides/07 - javadoc-jar/07-JAR-Javadoc.pdf"
92-
- "$TRAVIS_BUILD_DIR/slides/08 - code-quality-multiplatform-profiling/08-code-analysis.pdf"
93-
- "$TRAVIS_BUILD_DIR/slides/09 - dvcs-workflow/09-DVCS-Workflow.pdf"
94-
- "$TRAVIS_BUILD_DIR/slides/10 - javafx/10-JavaFX.pdf"
95-
- "$TRAVIS_BUILD_DIR/slides/13 - report-template/13-template.pdf"
96-
- "$TRAVIS_BUILD_DIR/workspace/*.zip"
97-
98-
notifications:
99-
email:
100-
recipients:
101-
- [email protected]
102-
- [email protected]
103-
- [email protected]
104-
- [email protected]
105-
on_success: never
1+
# Do not double-build branches and PRs from this repo
2+
# Do not build auto-tagged versions
3+
if: repo != head_repo AND tag !~ /^[\w\.]+-\d+-\w+/
4+
5+
env:
6+
global:
7+
- TERM=dumb
8+
- GRAVIS_REPO="https://github.com/DanySK/Gravis-CI.git"
9+
- GRAVIS="$HOME/gravis"
10+
11+
language: java
12+
os: linux
13+
dist: focal
14+
addons:
15+
apt:
16+
sources:
17+
- sourceline: 'deb [arch=amd64] http://miktex.org/download/ubuntu focal universe'
18+
key_url: "http://keyserver.ubuntu.com/pks/lookup?op=get&search=miktex"
19+
update: true
20+
packages:
21+
# For git latexdiff
22+
- latexdiff
23+
# Image processing
24+
- inkscape
25+
# DOT and GV support
26+
- graphviz
27+
# Tikz support
28+
- gnuplot
29+
# LaTeX decent font processor
30+
- cm-super
31+
# Interpreter for PostScript
32+
- ghostscript
33+
# ICC color profiles for PDF/A
34+
- icc-profiles
35+
# Syntax highlighting for Minted
36+
- python3-pygments
37+
# LaTeX packages
38+
- texlive
39+
# Includes:
40+
# - texlive-base
41+
# which includes:
42+
# - tex-common
43+
# - texlive-latex-recommended
44+
# which includes:
45+
# - texlive-binaries
46+
# - texlive-latex-base
47+
# which includes:
48+
# - fonts-lmodern
49+
# - texlive-fonts-recommended
50+
- texlive-latex-extra
51+
- texlive-publishers
52+
- texlive-science
53+
- texlive-fonts-extra
54+
# Italian
55+
- texlive-lang-italian
56+
# Biber replacement for BibLaTeX
57+
- biber
58+
- texlive-bibtex-extra
59+
# Debug
60+
- tree
61+
62+
install:
63+
- travis_retry git clone --depth 1 $GRAVIS_REPO $GRAVIS
64+
65+
before_script:
66+
# Debug prints
67+
- gradle --version
68+
- pdflatex --version
69+
- pygmentize -V
70+
- inkscape --version
71+
- gs --version
72+
- dot -V
73+
74+
script:
75+
- cd slides
76+
- chmod +x gradlew
77+
- ./gradlew buildLatex
78+
79+
after_script:
80+
- git checkout master
81+
- git add gradlew
82+
- git commit -m "[ci skip] [automatic] Make gradlew executable again"
83+
- git push "[email protected]:${TRAVIS_REPO_SLUG}.git" master
84+
85+
after_success:
86+
- git config --local user.name "Danilo Pianini's Travis CI automation bot"
87+
- git config --local user.email "[email protected]"
88+
89+
before_deploy:
90+
- $GRAVIS/autotag
91+
- cd $TRAVIS_BUILD_DIR/workspace
92+
# zip all workspace/* folders
93+
- for i in */; do zip -r "${i%/}.zip" "$i"; done
94+
95+
deploy:
96+
- provider: releases
97+
edge: true
98+
repo: "APICe-at-DISI/OOP-lab-public"
99+
on:
100+
all_branches: true
101+
condition: $TRAVIS_BRANCH = master || $TRAVIS_TAG != ""
102+
file:
103+
- "$TRAVIS_BUILD_DIR/slides/00 - intro/00-intro.pdf"
104+
- "$TRAVIS_BUILD_DIR/slides/01 - java-basic-tools/01-basic-tools.pdf"
105+
- "$TRAVIS_BUILD_DIR/slides/02 - java-advanced-tools/02-advanced-tools.pdf"
106+
- "$TRAVIS_BUILD_DIR/slides/03 - eclipse/03-eclipse.pdf"
107+
- "$TRAVIS_BUILD_DIR/slides/04 - dvcs-1/04-git-intro.pdf"
108+
- "$TRAVIS_BUILD_DIR/slides/05 - dvcs-2/05-branching-merging.pdf"
109+
- "$TRAVIS_BUILD_DIR/slides/06 - dvcs-testing/06-DVCS3-junit.pdf"
110+
- "$TRAVIS_BUILD_DIR/slides/07 - javadoc-jar/07-JAR-Javadoc.pdf"
111+
- "$TRAVIS_BUILD_DIR/slides/08 - code-quality-multiplatform-profiling/08-code-analysis.pdf"
112+
- "$TRAVIS_BUILD_DIR/slides/09 - dvcs-workflow/09-DVCS-Workflow.pdf"
113+
- "$TRAVIS_BUILD_DIR/slides/10 - javafx/10-JavaFX.pdf"
114+
- "$TRAVIS_BUILD_DIR/slides/13 - report-template/13-template.pdf"
115+
- "$TRAVIS_BUILD_DIR/workspace/*.zip"
116+
117+
notifications:
118+
email:
119+
recipients:
120+
- [email protected]
121+
- [email protected]
122+
- [email protected]
123+
- [email protected]
124+
on_success: never

‎README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
# OOP-Lab
2+
23
[![Build Status](https://travis-ci.com/APICe-at-DISI/OOP-Lab.svg?token=gFNEyVkpY7xNqwmKzp7q&branch=master)](https://travis-ci.com/APICe-at-DISI/OOP-Lab)
34

45
Laboratory of Object Oriented Programming

‎slides/00 - intro/00-intro.tex

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,7 @@ \section{Forum e supporto}
171171
\end{block}
172172
\begin{block}{Canale per le correzioni}
173173
\begin{itemize}
174-
\item \textbf{Nome canale}: Correzioni
174+
\item \textbf{Nome canale}: Correzioni-DD-MM-YYYY
175175
\item Ad ogni esercizio terminato, ogni studente \textbf{deve} prenotarsi per far correggere quanto fatto
176176
\end{itemize}
177177
\end{block}

‎workspace/lab02/00-codeorg/README.md

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,10 @@
44
#### FASE 1 - Compilazione in percorsi arbitrari
55

66
1. Si osservi la struttura del progetto: la cartella `src` contiene il sorgente.
7-
2. Si crei una nuova cartella `bin` (usare il comando `mkdir` e non il file manager)
7+
2. Si crei una nuova cartella `bin`
8+
- In Unix: usare il comando `mkdir`
9+
- In Windows: usare il comando `md`
10+
- non usare il file manager!
811
3. Si esegua la compilazione dentro bin
912
- In Unix: `javac -d bin src/Calculator.java`
1013
- In Windows: `javac -d bin src\Calculator.java`

0 commit comments

Comments
 (0)