Changeset ea7266a

Timestamp:

10/30/2016 10:46:49 PM (7 years ago)

Author:

DJ Lucas <dj@…>

Branches:

10.0, 10.1, 11.0, 11.1, 11.2, 11.3, 12.0, 12.1, 8.0, 8.1, 8.2, 8.3, 8.4, 9.0, 9.1, basic, bdubbs/svn, elogind, kea, ken/TL2024, ken/inkscape-core-mods, ken/tuningfonts, lazarus, lxqt, nosym, perl-modules, plabs/newcss, plabs/python-mods, python3.11, qt5new, rahul/power-profiles-daemon, renodr/vulkan-addition, trunk, upgradedb, xry111/intltool, xry111/llvm18, xry111/soup3, xry111/test-20220226, xry111/xf86-video-removal

Children:

358c6d16

Parents:

c840bd37

Message:

Use Mavne repor for hamcrest download links, use indiviual profile.d file for Ant.

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/trunk/BOOK@17924 af4574ff-66df-0310-9fd7-8a98e5e911e0

Location:

general/prog

Files:

• apache-ant.xml (modified) (4 diffs)
• junit.xml (modified) (2 diffs)

general/prog/apache-ant.xml

@@ -69 +69 @@
         <para>
           Required file: <ulink
-             url="&sources-anduin-http;/other/junit-&junit-version;.jar">
-                  &sources-anduin-http;/other/junit-&junit-version;.jar</ulink>
+             url="http://repo1.maven.org/maven2/junit/junit/&junit-version;/junit-&junit-version;.jar"/>
         </para>
       </listitem>
@@ -76 +75 @@
         <para>
           Required file: <ulink
-             url="http://hamcrest.googlecode.com/files/hamcrest-&hamcrest-version;.tgz">
-                  http://hamcrest.googlecode.com/files/hamcrest-&hamcrest-version;.tgz </ulink>
+             url="http://repo1.maven.org/maven2/org/hamcrest/hamcrest-core/&hamcrest-version;/hamcrest-core-&hamcrest-version;.jar"/>
         </para>
       </listitem>
@@ -123 +121 @@
     local directory tree.</para>
 
-<screen><userinput>tar -xvf ../hamcrest-&hamcrest-version;.tgz &amp;&amp;
-cp -v ../junit-&junit-version;.jar \
-      hamcrest-&hamcrest-version;/hamcrest-core-&hamcrest-version;.jar lib/optional</userinput></screen>
+<screen><userinput>cp -v ../junit-&junit-version;.jar \
+      ../hamcrest-core-&hamcrest-version;.jar lib/optional</userinput></screen>
 
     <para>Install <application>Apache Ant</application> by running the following
@@ -191 +188 @@
       class="username">root</systemitem> user:</para>
 
-<screen role="root"><userinput>cat &gt;&gt; /etc/profile.d/extrapaths.sh &lt;&lt; EOF
-<literal>
-# Begin Apache-ant addition
+<screen role="root"><userinput>cat &gt; /etc/profile.d/ant.sh &lt;&lt; EOF
+<literal># Begin /etc/profile.d/ant.sh
 
 pathappend /opt/ant/bin
 export ANT_HOME=/opt/ant
 
-# End Apache-ant addition
-</literal>
+# End /etc/profile.d/ant.sh</literal>
 EOF</userinput></screen>
 

general/prog/junit.xml

@@ -67 +67 @@
         <para>
           Required file: <ulink
-             url="http://hamcrest.googlecode.com/files/hamcrest-&hamcrest-version;.tgz">
-                  http://hamcrest.googlecode.com/files/hamcrest-&hamcrest-version;.tgz </ulink>
+             url="http://repo1.maven.org/maven2/org/hamcrest/hamcrest-core/&hamcrest-version;/hamcrest-core-&hamcrest-version;.jar"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Required file: <ulink
+             url="http://repo1.maven.org/maven2/org/hamcrest/hamcrest-core/&hamcrest-version;/hamcrest-core-&hamcrest-version;-sources.jar"/>
         </para>
       </listitem>
@@ -104 +109 @@
     </para>
 
-<screen><userinput>tar -xf ../hamcrest-&hamcrest-version;.tgz                              &amp;&amp;
-cp -v hamcrest-&hamcrest-version;/hamcrest-core-&hamcrest-version;{,-sources}.jar lib/ &amp;&amp;
+<screen><userinput>cp -v ../hamcrest-core-&hamcrest-version;{,-sources}.jar lib/ &amp;&amp;
 ant populate-dist</userinput></screen>