Skip to content

Commit

Permalink
Merge branch 'master' into stable
Browse files Browse the repository at this point in the history
  • Loading branch information
@claeis
claeis committed Dec 4, 2024
2 parents dda6aec + 621dd96 commit 81646d0
Show file tree
Hide file tree
Showing 5 changed files with 29 additions and 13 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ before_script:
- python -m pip freeze

script:
- ./gradlew -Drst2html=`which rst2html.py` build usrdoc
- ./gradlew -Drst2html=`which rst2html.py` usrdoc build
deploy:
- provider: script
skip_cleanup: true
Expand Down
16 changes: 8 additions & 8 deletions build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ allprojects {
compileJava.options.encoding = 'US-ASCII'
}

version '1.14.3'+System.getProperty('release','-SNAPSHOT')
version '1.14.4'+System.getProperty('release','-SNAPSHOT')

configurations {
deployerJars
Expand All @@ -24,9 +24,9 @@ configurations {
dependencies {
compile group: 'ch.ehi', name: 'ehibasics', version: '1.4.1'
compile group: 'ch.interlis', name: 'iox-api', version: '1.0.4'
compile group: 'ch.interlis', name: 'iox-ili', version: '1.23.1'
compile group: 'ch.interlis', name: 'ili2c-tool', version: "5.5.4"
compile group: 'ch.interlis', name: 'ili2c-core', version: "5.5.4"
compile group: 'ch.interlis', name: 'iox-ili', version: '1.23.3'
compile group: 'ch.interlis', name: 'ili2c-tool', version: "5.6.2"
compile group: 'ch.interlis', name: 'ili2c-core', version: "5.6.2"
testCompile group: 'junit', name: 'junit', version: '4.12'
deployerJars "org.apache.maven.wagon:wagon-ftp:3.3.3"
deployerJars "org.apache.maven.wagon:wagon-ssh:3.3.3"
Expand Down Expand Up @@ -61,6 +61,7 @@ def docs_usr = System.getProperty('docs_usr',properties.get('docs_usr','docs_usr
def python= System.getProperty('python',properties.get('python','python'))
def rst2html= System.getProperty('rst2html',properties.get('rst2html','rst2html'))
def github_token= System.getProperty('github_token',properties.get('github_token','github_token'))
def html_outfile=new File(project.buildDir,'docs/ilivalidator.html')

def generatedResources = "$buildDir/generated-resources/main"

Expand Down Expand Up @@ -168,23 +169,22 @@ task usrdoc(type:Exec) {
group = JavaBasePlugin.DOCUMENTATION_GROUP
description = 'Builds the user documentation (html)'
def infile=new File(project.projectDir,'docs/ilivalidator.rst')
def outfile=new File('docs/ilivalidator.html')
inputs.file infile
outputs.file outfile
outputs.file html_outfile
doFirst{
new File(project.buildDir,'docs').mkdir()
}
workingDir = project.buildDir
executable python
args = [rst2html, infile, outfile]
args = [rst2html, infile, html_outfile]
}

task bindist(type: Zip){
baseName = project.name
destinationDir = file('dist')
from jar
into('docs'){
from files(fileTree("docs").include("LICENSE.*"),"docs/README.txt","docs/CHANGELOG.txt","docs/Beispiel1.ili","docs/Beispiel1.ini","docs/Beispiel1.xtf","docs/IliVErrors.ili","docs/ilivalidator.html")
from files(fileTree("docs").include("LICENSE.*"),"docs/README.txt","docs/CHANGELOG.txt","docs/Beispiel1.ili","docs/Beispiel1.ini","docs/Beispiel1.xtf","docs/IliVErrors.ili",html_outfile)
}
into('libs'){
from configurations.runtimeClasspath
Expand Down
8 changes: 8 additions & 0 deletions docs/CHANGELOG.txt
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,11 @@
ilivalidator 1.14.4 (2024-12-04)
--------------------------------
- fix INTERLIS.elementCount(undefined attribute) (#430)
- Xtf23: use Xtf23Reader by default
- ili2c-5.6.2
- iox-ili-1.23.3


ilivalidator 1.14.3 (2024-08-16)
--------------------------------
- Validate VIEW in non-validation models (#324)
Expand Down
14 changes: 11 additions & 3 deletions docs/ilivalidator.rst
View file
Original file line number Diff line number Diff line change
Expand Up @@ -258,7 +258,7 @@ Optionen:
| | </categories> |
| | |
+---------------------------------------------+----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
| ``--forceTypeValidation`` | Ignoriert die Konfiguration der Typprüfung aus der INI-Datei, d.h. es kann nur die Multiplizität aufgeweicht werden. |
| ``--forceTypeValidation`` | Ignoriert die Konfiguration der Typprüfung (mittels Metaattribut ``!!@ ilivalid.type``) aus der ili-Datei , d.h. es kann nur die Multiplizität aufgeweicht werden. |
| | |
+---------------------------------------------+----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
| ``--disableAreaValidation`` | Schaltet die AREA Topologieprüfung aus (XTF). |
Expand Down Expand Up @@ -491,8 +491,9 @@ INI-Globale Konfigurationen
| | defaultGeometryTypeValidation="off" | Mögliche Einstellungen sind: "warning", "off", "on". DEFAULT ist "on". |
| | | |
+---------------------------------+-------------------------------------------+-----------------------------------------------------------------------------------+
| allowOnlyMultiplicityReduction | ["PARAMETER"] | "true" ignoriert die Konfiguration der Typprüfungen aus der INI-Datei, |
| | allowOnlyMultiplicityReduction="true" | d.h. es kann nur die Prüfung der Multiplizität konfiguriert werden. |
| allowOnlyMultiplicityReduction | ["PARAMETER"] | "true" ignoriert die Konfiguration der Typprüfungen (mittels Metaattribut |
| | allowOnlyMultiplicityReduction="true" | ``!!@ ilivalid.type``) aus der ili-Datei, |
| | | d.h. es kann nur die Prüfung der Multiplizität konfiguriert werden. |
| | | Mögliche Einstellungen sind: "true", "false". DEFAULT ist "false". |
| | | |
+---------------------------------+-------------------------------------------+-----------------------------------------------------------------------------------+
Expand Down Expand Up @@ -710,6 +711,13 @@ Die qualifizierten Rollennamen werden auch im Log aufgeführt. z.B.
Info: validate target of role ``M.T.BAttrB2.B``...
Info: validate multiplicity of role ``M.T.BAttrB2.B``...

Nicht implementierte Funktionen
-------------------------------

- Views (Syntaxregel ViewDef) mit Ausnahme von einfachen Projektionen werden nicht validiert
- Linienattribute (Syntaxregel LineAttrDef) werden nicht validiert (Linienattribute gibt es in INTERLIS 2.4 nicht mehr)
- zusätzliche Kurvenformen (Syntaxregel LineFormTypeDef), zusätzlich zu Geraden und Kreisbögen, werden nicht unterstützt

Hinweise zu Fehlermeldungen
---------------------------

Expand Down
2 changes: 1 addition & 1 deletion test/data/ilirepository/Simple22a.xtf
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<TRANSFER xmlns="http://www.interlis.ch/INTERLIS2.2">
<HEADERSECTION SENDER="ili2c-4.5.22-20160520" VERSION="2.3">
<HEADERSECTION SENDER="ili2c-4.5.22-20160520" VERSION="2.2">
<MODELS>
<MODEL NAME="Simple" VERSION="2011-12-22" URI="http://interlis.ch"></MODEL>
</MODELS>
Expand Down

0 comments on commit 81646d0

Please sign in to comment.