Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feature/toolchain #337

Open
wants to merge 50 commits into
base: develop
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
50 commits
Select commit Hold shift + click to select a range
ef22a0b
increase code duplication limit to 25 tokens
magwas Mar 28, 2019
354ff10
Merge remote-tracking branch 'edemo/develop' into develop
magwas Mar 30, 2019
606e104
Merge remote-tracking branch 'edemo/develop' into develop
magwas Apr 8, 2019
b5675ab
Merge remote-tracking branch 'edemo/develop' into develop
magwas Apr 8, 2019
d9da8db
Merge remote-tracking branch 'edemo/develop' into develop
magwas Apr 16, 2019
8cb5095
Merge remote-tracking branch 'edemo/develop' into develop
magwas Apr 18, 2019
8185adb
Spring refactor of #242
szirbucz Apr 29, 2019
236dcb2
Rename choices to winner list and write test case. #219
szirbucz Apr 30, 2019
dd0925c
Add tallying to computed vote for each counted assurance. #207
szirbucz May 3, 2019
5955a92
Make Tally child of BaseEntity.
szirbucz May 3, 2019
a329bad
Merge remote-tracking branch 'edemo/develop' into develop
magwas May 6, 2019
43171ea
object in metamodel, and examples in Schulze method
magwas May 8, 2019
8527e0e
Merge remote-tracking branch 'edemo/develop' into feature/object_in_m…
magwas May 13, 2019
68cc062
first tab at model generation
magwas May 15, 2019
b874d67
fields, parameters and returns can be of generic type
magwas May 15, 2019
df4a6f6
views, document generation hack
magwas May 16, 2019
a1a2188
modeling
magwas Jun 4, 2019
101cdbf
Merge remote-tracking branch 'edemo/develop' into feature/object_in_m…
magwas Jun 4, 2019
863be35
Merge remote-tracking branch 'szirbucz/feature/vote-result-contains-t…
magwas Jun 4, 2019
5da27bd
Merge remote-tracking branch 'szirbucz/feature/vote-result-contains-w…
magwas Jun 4, 2019
91c5b15
Merge remote-tracking branch 'szirbucz/feature/the_assurances_of_the_…
magwas Jun 4, 2019
5389d5f
deleted unnecessary file
magwas Jun 6, 2019
fb84264
new Dockerfile, reformat source
magwas Jul 31, 2019
19e66cf
midair
magwas Aug 1, 2019
805f537
builds with kodekonveyor/toolchain image
magwas Aug 1, 2019
f8cc9b5
cache .m2 in shippable
magwas Aug 1, 2019
23b5fab
fix docker image tag
magwas Aug 1, 2019
9f7b512
dev/random hack is back
magwas Aug 1, 2019
8678545
added kkpipeline integration
magwas Aug 28, 2019
c1b8551
Merge remote-tracking branch 'edemo/develop' into feature/toolchain
magwas Aug 29, 2019
1c0d6c2
debug
magwas Sep 2, 2019
2db0254
debug
magwas Sep 2, 2019
bcc25b3
entropy
magwas Sep 2, 2019
2500cbb
sonar org
magwas Sep 2, 2019
747c0eb
debug
magwas Sep 2, 2019
2dc172e
debug
magwas Sep 2, 2019
b19923f
debug
magwas Sep 2, 2019
c9495dd
entropy, publish tests on shippable, required pom elements
magwas Sep 2, 2019
c207529
fixup
magwas Sep 2, 2019
68974ac
rewound debugs
magwas Sep 2, 2019
08109dc
more debug rewind
magwas Sep 2, 2019
3a3f509
integration envvars
magwas Sep 2, 2019
41ab019
debug again...
magwas Sep 2, 2019
1cfe5ac
envvars still
magwas Sep 2, 2019
079b047
fixup
magwas Sep 2, 2019
0146b03
fixup
magwas Sep 2, 2019
d767d2b
more debug
magwas Sep 2, 2019
fd80524
removed a debug, shippable hook button clicked
magwas Sep 14, 2019
df64d2b
debug
magwas Sep 14, 2019
62e2a3e
trigger build
magwas Sep 14, 2019
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 0 additions & 7 deletions .eclipse-pmd

This file was deleted.

8 changes: 0 additions & 8 deletions .pmd

This file was deleted.

1 change: 0 additions & 1 deletion .settings/org.eclipse.wst.common.component
Original file line number Diff line number Diff line change
Expand Up @@ -56,5 +56,4 @@




</project-modules>
97 changes: 18 additions & 79 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,79 +1,18 @@
all: install

install: compile sonar shippable
cp -rf engine/* target/* shippable

shippable:
mkdir -p shippable

sonar: sonarconfig buildreports
./tools/pullanalize

sonarconfig:
cp etc/m2/settings.xml ~/.m2

compile: zentaworkaround javabuild engine.compiled codedocs

codedocs: shippable/engine-testcases.xml shippable/engine-implementedBehaviours.xml shippable/engine-implementedBehaviours.html shippable/bugpriorities.xml

shippable/engine-testcases.xml: engine.richescape shippable
zenta-xslt-runner -xsl:generate_test_cases.xslt -s engine.richescape outputbase=shippable/engine-

shippable/engine-implementedBehaviours.xml: buildreports shippable
zenta-xslt-runner -xsl:generate-behaviours.xslt -s target/test/javadoc.xml outputbase=shippable/engine-

CONSISTENCY_INPUTS=shippable/engine-testcases.xml shippable/engine-implementedBehaviours.xml

include /usr/share/zenta-tools/model.rules

engine.consistencycheck: engine.rich engine.check $(CONSISTENCY_INPUTS)
zenta-xslt-runner -xsl:xslt/consistencycheck.xslt -s:$(basename $@).check -o:$@ >$(basename $@).consistency.stderr 2>&1
sed 's/\//:/' <$(basename $@).consistency.stderr |sort --field-separator=':' --key=2

testenv:
./tools/testenv

javabuild: maven buildreports
touch javabuild

maven: target/PDEngine-0.0.1-SNAPSHOT.jar javadoc


javadoc:
mkdir -p target/production target/test
JAVA_HOME=/usr/lib/jvm/java-11-openjdk-amd64 mvn javadoc:javadoc javadoc:test-javadoc site

target/PDEngine-0.0.1-SNAPSHOT.jar: maven-prepare keystore maven-build

maven-prepare:
mvn build-helper:parse-version versions:set versions:commit -DnewVersion=\$${parsedVersion.majorVersion}.\$${parsedVersion.minorVersion}.\$${parsedVersion.incrementalVersion}-$$(tools/getbranch|sed 'sA/A_Ag').$$(git rev-parse --short HEAD)
mvn clean

maven-build:
mvn org.jacoco:jacoco-maven-plugin:prepare-agent install org.pitest:pitest-maven:mutationCoverage site -Pintegration-test

buildreports: maven
zenta-xslt-runner -xsl:cpd2pmd.xslt -s:target/pmd.xml -o target/pmd_full.xml
find ~/.m2/repository/org/slf4j/slf4j-api/ -regex .*slf4j-api-[0-9.]*.jar -exec ln -f -s {} /tmp/slf4j-api.jar \;
find ~/.m2/repository/org/slf4j/slf4j-simple/ -regex .*slf4j-simple-[0-9.]*.jar -exec ln -f -s {} /tmp/slf4j-simple.jar \;
java -cp /tmp/slf4j-api.jar:/tmp/slf4j-simple.jar:/usr/local/lib/mutation-analysis-plugin-1.3-SNAPSHOT.jar ch.devcon5.sonar.plugins.mutationanalysis.StandaloneAnalysis

clean:
git clean -fdx
rm -rf zenta-tools xml-doclet

inputs/engine.issues.xml: shippable/engine-implementedBehaviours.xml shippable/engine-testcases.xml
mkdir -p inputs
tools/getGithubIssues edemo PDEngine f279765590d25bedfc9f08f7fc39a8c39c891711 >inputs/engine.issues.xml

zentaworkaround:
mkdir -p ~/.zenta/.metadata/.plugins/org.eclipse.e4.workbench/
cp workbench.xmi ~/.zenta/.metadata/.plugins/org.eclipse.e4.workbench/
touch zentaworkaround

shippable/bugpriorities.xml: engine.consistencycheck inputs/engine.issues.xml engine.richescape shippable
zenta-xslt-runner -xsl:issue-priorities.xslt -s:engine.consistencycheck -o:shippable/bugpriorities.xml issuesfile=inputs/engine.issues.xml modelfile=engine.richescape missingissuefile=shippable/missing.xml

keystore:
./tools/generate_keystore

export GITHUB_ORGANIZATION=edemo
export SONAR_ORG=edemo
export REPO_NAME=PDEngine
MODEL_BASENAME = engine
JAVA_TARGET = PDEngine-0.0.1-SNAPSHOT.jar
BEFORE_MAVEN_BUILD = entropy
BEFORE_SONAR = publish_tests

include /usr/local/toolchain/rules.java

entropy:
rm /dev/random; cp -a /dev/urandom /dev/random; set |sed 's/[0-9]/X/g'

publish_tests:
mvn org.jacoco:jacoco-maven-plugin:report
cp -r target/site/jacoco shippable/codecoverage
mkdir -p shippable/testresults
mv target/surefire-reports/*.xml shippable/testresults
69 changes: 0 additions & 69 deletions cpd2pmd.xslt

This file was deleted.

Empty file removed etc/m2/settings.encrypted.magwas
Empty file.
20 changes: 0 additions & 20 deletions etc/m2/settings.xml

This file was deleted.

167 changes: 0 additions & 167 deletions generate-behaviours.xslt

This file was deleted.

Loading