Re: svn commit: r889380 - in /ant/ivy/updatesite/trunk: build.xml site-template.xml

Mon, 14 Dec 2009 08:25:18 -0800

Strange... I would swear they weren't there the last build. I can revert that last then; at worst they tell me their next release will correct their error. 

Thanks,
Matt

On Dec 14, 2009, at 9:36 AM, Nicolas Lalevée wrote:


On Sat, 12 Dec 2009 13:52:20 -0600, Matt Benson <[email protected]>
wrote:

Sorry, Nicolas--I didn't see this.  I've been using Mac Mail with
gmail and it's been marking half my ASF stuff as junk.  :/  Anyway,
the situation was that Genuitec Pulse apparently implemented their
own lookup against Eclipse update sites, but they apparently missed
the part where the pack200 attribute means they should first look for
packed resources, then for unpacked ones if they don't find the
packed ones.  The official updatesite has the packed ones, so no
worries.  The Hudson site does not have packed resources, so I just
set it up so that the Hudson site would show pack200="false" and
everyone should be happy--it did indeed solve my problems with
Pulse.  Does that make sense?


Then something goes wrong somewhere, because I do see packed jars on
hudson:
http://hudson.zones.apache.org/hudson/view/Ant/job/IvyDE-updatesite/ lastSuccessfulBuild/artifact/trunk/build/plugins/ 

Nicolas



-Matt

On Dec 12, 2009, at 5:30 AM, Nicolas Lalevée wrote:


Matt, could you explain what is going wrong with the update site on
hudson. If we have worries with the hudson one we probably will
have some
with the offical one.

Nicolas

On Thu, 10 Dec 2009 19:40:19 -0000, [email protected] wrote:

Author: mbenson
Date: Thu Dec 10 19:40:18 2009
New Revision: 889380

URL: http://svn.apache.org/viewvc?rev=889380&view=rev
Log:
tweak hudson build to be compatible with updatesite clients who don't 
realize that pack200 still means the packed artifacts are optional

Modified:
    ant/ivy/updatesite/trunk/build.xml
    ant/ivy/updatesite/trunk/site-template.xml

Modified: ant/ivy/updatesite/trunk/build.xml
URL:


http://svn.apache.org/viewvc/ant/ivy/updatesite/trunk/build.xml?
rev=889380&r1=889379&r2=889380&view=diff
==================================================================== == 
========

--- ant/ivy/updatesite/trunk/build.xml (original)
+++ ant/ivy/updatesite/trunk/build.xml Thu Dec 10 19:40:18 2009
@@ -194,6 +194,7 @@

     <target name="generate-site">
         <mkdir dir="${updatesite.dir}" />
+        <property name="site.pack200" value="true" />
         <copy file="${basedir}/site-template.xml"
         tofile="${updatesite.dir}/site.xml" overwrite="true">
             <filterchain>
                 <replacetokens>
@@ -201,6 +202,7 @@
                     <token key="UPDATESITE_URL"

value="${updatesite.url}"

                     />
                     <token key="IVY_VERSION" value="$
{ivy.version}" />
                     <token key="IVYDE_VERSION" value="$
{ivyde.version}"

/>

+                    <token key="SITE_PACK200" value="$
{site.pack200}"

/>

                 </replacetokens>
             </filterchain>
         </copy>
@@ -403,6 +405,10 @@
         <property name="ivyde.zip" refid="ivyde.zip.id" />
     </target>

-    <target name="hudson-build"


depends="clean,hudson-find-ivy-jar,hudson-find-ivyde-zip,install-
ivy-and-ivyde,optimize,checksum"

/>
+    <target name="suppress-pack200">
+        <property name="site.pack200" value="false" />
+    </target>
+
+    <target name="hudson-build"


depends="clean,hudson-find-ivy-jar,hudson-find-ivyde-zip,suppress-
pack200,install-ivy-and-ivyde,optimize,checksum"

/>

 </project>

Modified: ant/ivy/updatesite/trunk/site-template.xml
URL:


http://svn.apache.org/viewvc/ant/ivy/updatesite/trunk/site-
template.xml?rev=889380&r1=889379&r2=889380&view=diff
==================================================================== == 
========

--- ant/ivy/updatesite/trunk/site-template.xml (original)
+++ ant/ivy/updatesite/trunk/site-template.xml Thu Dec 10 19:40:18
2009
@@ -17,7 +17,7 @@
    specific language governing permissions and limitations
    under the License.
 -->
-<site pack200="true"
+<site pack200="@SITE_PACK200@"
       mirrorsURL="@MIRRORS_URL@"
       digestURL="./">
    <description url="@UPDATESITE_URL@">
-------------------------------------------------------------------- - 
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]




---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]


---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]




---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to