Skip to content

Commit 98a6aa8

Browse files
hsg-commitshsg-commits
committed
'Committed via HSG-Publish'
1 parent 87b5208 commit 98a6aa8

File tree

6 files changed

+1776
-7684
lines changed

6 files changed

+1776
-7684
lines changed

‎build.xml‎

Lines changed: 42 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<project default="xar" name="administrative-timeline" basedir=".">
3-
<xmlproperty file="build.properties.xml" semanticAttributes="true" keepRoot="false" />
4-
<property name="build.dir" value="build" />
5-
<property name="git.repo.path" value="${basedir}/.git" />
6-
<available file="${git.repo.path}" type="dir" property="git.present" />
3+
<xmlproperty file="build.properties.xml" semanticAttributes="true" keepRoot="false"/>
4+
<property name="build.dir" value="build"/>
5+
<property name="git.repo.path" value="${basedir}/.git"/>
6+
<available file="${git.repo.path}" type="dir" property="git.present"/>
77

88
<condition property="is-release">
9-
<equals arg1="${release}" arg2="true" />
9+
<equals arg1="${release}" arg2="true"/>
1010
</condition>
1111

1212
<target name="release.true" if="is-release">
@@ -21,76 +21,71 @@
2121
</target>
2222

2323
<target name="clean">
24-
<echo message="Deleting xar files..." />
25-
<delete dir="${build.dir}" failonerror="false" />
24+
<echo message="Deleting xar files..."/>
25+
<delete dir="${build.dir}" failonerror="false"/>
2626
</target>
2727

28-
<target name="templates" description="process template files" if="is-release"
29-
depends="git.revision">
30-
<echo message="Apply values to .tmpl ..." />
28+
<target name="templates" description="process template files" if="is-release" depends="git.revision">
29+
<echo message="Apply values to .tmpl ..."/>
3130
<copy todir="${basedir}" overwrite="true" verbose="true">
32-
<fileset file="*.xml.tmpl" />
31+
<fileset file="*.xml.tmpl"/>
3332
<filterchain>
3433
<replacetokens>
35-
<token key="name" value="${app.name}" />
36-
<token key="version" value="${app.version}" />
37-
<token key="url" value="${app.url}" />
38-
<token key="title" value="${app.title}" />
39-
<token key="commit-id" value="${git.revision}" />
40-
<token key="commit-time" value="${git.time}" />
34+
<token key="name" value="${app.name}"/>
35+
<token key="version" value="${app.version}"/>
36+
<token key="url" value="${app.url}"/>
37+
<token key="title" value="${app.title}"/>
38+
<token key="commit-id" value="${git.revision}"/>
39+
<token key="commit-time" value="${git.time}"/>
4140
</replacetokens>
4241
<tokenfilter>
4342
<!-- until we move template processing to XSLT, take care with reserved
4443
characters -->
45-
<replacestring from="&amp;" to="&amp;amp;" />
44+
<replacestring from="&amp;" to="&amp;amp;"/>
4645
</tokenfilter>
4746
</filterchain>
48-
<globmapper from="*.tmpl" to="*" />
47+
<globmapper from="*.tmpl" to="*"/>
4948
</copy>
5049
</target>
5150

52-
<target name="xar" depends="clean,check-release,git.revision,templates"
53-
description="create xar file">
54-
<echo message="Creating build folder..." />
55-
<mkdir dir="${build.dir}" />
51+
<target name="xar" depends="clean,check-release,git.revision,templates" description="create xar file">
52+
<echo message="Creating build folder..."/>
53+
<mkdir dir="${build.dir}"/>
5654

57-
<echo message="------------------------------------------------------------" />
58-
<echo message="Creating xar file..." />
59-
<echo message="------------------------------------------------------------" />
55+
<echo message="------------------------------------------------------------"/>
56+
<echo message="Creating xar file..."/>
57+
<echo message="------------------------------------------------------------"/>
6058

6159
<zip basedir="${basedir}" destfile="${build.dir}/${app.name}.xar">
62-
<exclude name="${build.dir}/**" />
63-
<exclude name="*.tmpl" />
64-
<exclude name=".github/**" />
65-
<exclude name="test/**" />
66-
<exclude name="node_modules/**" />
60+
<exclude name="${build.dir}/**"/>
61+
<exclude name="*.tmpl"/>
62+
<exclude name=".github/**"/>
63+
<exclude name="test/**"/>
64+
<exclude name="node_modules/**"/>
6765
</zip>
6866
<echo>Version: ${app.version}</echo>
6967
</target>
7068

71-
<target name="git.revision" description="Store git revision in ${repository.version}"
72-
if="is-release" depends="check-release">
73-
<exec executable="git" outputproperty="git.revision" failifexecutionfails="false"
74-
errorproperty="">
75-
<arg value="--git-dir=${git.repo.path}" />
76-
<arg value="rev-parse" />
77-
<arg value="HEAD" />
69+
<target name="git.revision" description="Store git revision in ${repository.version}" if="is-release" depends="check-release">
70+
<exec executable="git" outputproperty="git.revision" failifexecutionfails="false" errorproperty="">
71+
<arg value="--git-dir=${git.repo.path}"/>
72+
<arg value="rev-parse"/>
73+
<arg value="HEAD"/>
7874
</exec>
7975
<condition property="repository.version" value="${git.revision}" else="unknown">
8076
<and>
81-
<isset property="git.revision" />
82-
<length string="${git.revision}" trim="yes" length="0" when="greater" />
77+
<isset property="git.revision"/>
78+
<length string="${git.revision}" trim="yes" length="0" when="greater"/>
8379
</and>
8480
</condition>
8581
<echo>Git repo: ${repository.version}</echo>
8682

87-
<exec executable="git" outputproperty="git.time" failifexecutionfails="false"
88-
errorproperty="">
89-
<arg value="--git-dir=${git.repo.path}" />
90-
<arg value="show" />
91-
<arg value="-s" />
92-
<arg value="--format=%ct" />
93-
<arg value="${git.revision}" />
83+
<exec executable="git" outputproperty="git.time" failifexecutionfails="false" errorproperty="">
84+
<arg value="--git-dir=${git.repo.path}"/>
85+
<arg value="show"/>
86+
<arg value="-s"/>
87+
<arg value="--format=%ct"/>
88+
<arg value="${git.revision}"/>
9489
</exec>
9590
<echo>Git time: ${git.time}</echo>
9691

‎collection.xconf‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,7 @@
1414
<facet dimension="hsg-category" expression="'department'"/>
1515
<facet dimension="hsg-publication" expression="'timeline'"/>
1616
<field if="@type eq 'section'" name="hsg-fulltext" store="no"/>
17-
<field
18-
expression="'/departmenthistory/timeline' || (if (@xml:id) then '/' || substring-after(./@xml:id, 'chapter_') else ())"
19-
name="hsg-url"/>
17+
<field expression="'/departmenthistory/timeline' || (if (@xml:id) then '/' || substring-after(./@xml:id, 'chapter_') else ())" name="hsg-url"/>
2018
<!-- end required facets and fields -->
2119
</text>
2220
</lucene>

‎expath-pkg.xml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<package abbrev="administrative-timeline" name="http://history.state.gov/ns/data/administrative-timeline" spec="1.0" version="0.6.8"
3-
xmlns="http://expath.org/ns/pkg">
2+
<package xmlns="http://expath.org/ns/pkg" abbrev="administrative-timeline" name="http://history.state.gov/ns/data/administrative-timeline" spec="1.0" version="0.6.8">
43
<title>Administrative Timeline of the Department of State (data)</title>
54
</package>

‎repo.xml‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<meta commit-id="07334a5d451f7fc90c03d5a926a20a82ccc19f57" commit-time="1749726068" xmlns="http://exist-db.org/xquery/repo">
2+
<meta xmlns="http://exist-db.org/xquery/repo" commit-id="07334a5d451f7fc90c03d5a926a20a82ccc19f57" commit-time="1749726068">
33
<description>Administrative Timeline of the Department of State (data)</description>
44
<author>Office of the Historian</author>
55
<website>https://history.state.gov</website>
@@ -10,6 +10,5 @@
1010
<target>administrative-timeline</target>
1111
<prepare>pre-install.xql</prepare>
1212
<finish/>
13-
<permissions group="hsg" mode="rw-rw-r--" password="" user="hsg"
14-
xmlns:repo="http://exist-db.org/xquery/repo"/>
13+
<permissions xmlns:repo="http://exist-db.org/xquery/repo" password="" group="hsg" mode="rw-rw-r--" user="hsg"/>
1514
</meta>

0 commit comments

Comments
 (0)