Merge pull request #37 from joewiz/fix/abbrev-mismatch

Restore “abbrev”, not same as “app name”
eXist-db · Oct 5, 2018 · a74a3b2 · a74a3b2
2 parents 6d366e0 + 8217f42
commit a74a3b2
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 11 deletions.
diff --git a/build.properties b/build.properties
@@ -3,5 +3,10 @@
 # edit that.
 #
 
-project.name=shared-resources
-project.version=0.8.0
+# Do not modify these properties, or risk breaking package managers.
+project.abbrev=shared
+project.app=shared-resources
+project.name=http://exist-db.org/apps/shared
+
+# These properties can be changed.
+project.version=0.8.1
diff --git a/build.xml b/build.xml
@@ -2,7 +2,6 @@
 <project basedir="." default="all" name="shared-resources">
     <property file="local.build.properties"/>
     <property file="build.properties"/>
-    <property name="tools" value="./tools"/>
     <property name="build" value="./build"/>
     <property name="scripts" value="./resources/scripts"/>
     <property name="ace" value="${scripts}/ace"/>
@@ -40,10 +39,11 @@
         <copy file="expath-pkg.xml.tmpl" tofile="expath-pkg.xml" filtering="true" overwrite="true">
             <filterset>
                 <filter token="project.name" value="${project.name}"/>
+                <filter token="project.abbrev" value="${project.abbrev}"/>
                 <filter token="project.version" value="${project.version}"/>
             </filterset>
         </copy>
-        <zip destfile="${build}/${project.name}-${project.version}${git.commit}.xar">
+        <zip destfile="${build}/${project.app}-${project.version}${git.commit}.xar">
             <fileset dir=".">
                 <include name="*.*"/>
                 <include name="resources/**"/>
@@ -58,7 +58,7 @@
         <input message="Enter password:" addproperty="server.pass" defaultvalue="">
             <handler type="secure"/>
         </input>
-        <property name="xar" value="${project.name}-${project.version}${git.commit}.xar"/>
+        <property name="xar" value="${project.app}-${project.version}${git.commit}.xar"/>
         <exec executable="curl">
             <arg line="-T ${build}/${xar} -u admin:${server.pass} ${server.url}/${xar}"/>
         </exec>

diff --git a/expath-pkg.xml.tmpl b/expath-pkg.xml.tmpl
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<package xmlns="http://expath.org/ns/pkg" name="http://exist-db.org/apps/shared" abbrev="@project.name@" version="@project.version@" spec="1.0">
-    <title>Shared Resources: jquery, dojo, ace ...</title>
+<package xmlns="http://expath.org/ns/pkg" name="@project.name@" abbrev="@project.abbrev@" version="@project.version@" spec="1.0">
+    <title>Shared Resources: jquery, dojo, ace, templating, utilities</title>
     <dependency processor="http://exist-db.org" semver-min="3.0.4"/>
     <xquery>
         <namespace>http://exist-db.org/xquery/apps</namespace>

diff --git a/repo.xml b/repo.xml
@@ -58,7 +58,7 @@
         </change>
         <change version="0.4.2">
             <ul xmlns="http://www.w3.org/1999/xhtml">
-                <li>Minor release to restore package/@abbrev value to prevent problems on older systems querying public-repo.</li>
+                <li>Fixed: Restore package/@abbrev value to prevent problems on older systems querying public-repo - <a href="https://github.com/eXist-db/shared-resources/pull/22">#22</a></li>
             </ul>
         </change>
         <change version="0.5.0">
@@ -70,17 +70,22 @@
         </change>
         <change version="0.6.0">
             <ul xmlns="http://www.w3.org/1999/xhtml">
-                <li>Fixed: Split some functions into calls to smaller functions. Backwards compatible</li>
+                <li>Fixed: Split some functions into calls to smaller functions. Backwards compatible.</li>
             </ul>
         </change>
         <change version="0.7.0">
             <ul xmlns="http://www.w3.org/1999/xhtml">
-                <li>Improved internal documentation</li>
+                <li>Improved: Internal function documentation</li>
             </ul>
         </change>
         <change version="0.8.0">
             <ul xmlns="http://www.w3.org/1999/xhtml">
-                <li>Fixed - Infinite look in function lookup <a href="https://github.com/eXist-db/shared-resources/issues/33">#33</a></li>
+                <li>Fixed: Infinite loop in function lookup - <a href="https://github.com/eXist-db/shared-resources/issues/33">#33</a></li>
+            </ul>
+        </change>
+        <change version="0.8.1">
+            <ul xmlns="http://www.w3.org/1999/xhtml">
+                <li>Fixed: Restore legacy difference between package abbrev and app name - <a href="https://github.com/eXist-db/shared-resources/issues/36">#36</a></li>
             </ul>
         </change>
     </changelog>