Changeset 103

Timestamp:

Oct 18, 2005, 5:46:50 PM (20 years ago)

Author:

arnault

Message:

Improve Makefile see CL 288

Location:

CMT/HEAD

Files:

• ChangeLog (modified) (1 diff)
• mgr/Makefile (modified) (3 diffs)
• mgr/cmt.nmake (modified) (1 diff)

CMT/HEAD/ChangeLog

@@ -1 +1 @@
 2005-10-18    <arnault@lal.in2p3.fr> 288
+
+        * mgr/Makefile (bintar): Prepare and cleanup binary directories
+        before creating tar balls.
+
+        * mgr/Makefile (Export): Move the docs target from bintar to Export
 
         * source/cmt_symbol.cxx (print): Filter path values before

CMT/HEAD/mgr/Makefile

@@ -213 +213 @@
 # the source kit)
 #---------------------------------------------------------
-bintar :: docs
+bintar ::
         cd ..; root=`pwd`; \
         tag=`cmt version`; \
         version=`basename $${root}`; \
         tag=$${version} ; \
-        package=`dirname $${root}`; \
-        package=`basename $${package}`; \
         cat doc/CMTDownload1.html >| doc/CMTDownload.html; \
         echo '  <tr><td><a href="CMT'$${version}'.tar.gz">Source kit</a> </td></tr>' >> doc/CMTDownload.html; \
@@ -227 +225 @@
         done; \
         cat doc/CMTDownload2.html >> doc/CMTDownload.html; \
-        ${CMTROOT}/mgr/cmt_export.sh $${package}/ $${root}/doc/CMTDownload.html $${tag}; \
+        ${CMTROOT}/mgr/cmt_export.sh CMT/ $${root}/doc/CMTDownload.html $${tag}; \
         if test -d rpm; then \
-          ${CMTROOT}/mgr/cmt_export.sh $${package}/ $${root}/rpm/CMT-$${version}-1.i386.rpm $${tag}; \
+          ${CMTROOT}/mgr/cmt_export.sh CMT/ $${root}/rpm/CMT-$${version}-1.i386.rpm $${tag}; \
         fi; \
         cd ../../; \
         for branch in `echo $${binaries}` ; \
         do \
+          if test $${branch} = VisualC; then \
+            /bin/rm -rf CMT/$${version}/$${branch}/cmt ; \
+          else \
+            /bin/rm -rf CMT/$${version}/$${branch}/*.o ; \
+            ln -s cmt.exe CMT/$${version}/$${branch}/cmt ; \
+          fi ; \
           echo $${branch} ; \
-          tarfile=$${package}/$${package}$${version}$${branch}.tar; \
-          tar cf $${tarfile} $${package}/$${version}/mgr $${package}/$${version}/src $${package}/$${version}/$${branch} ; \
+          tarfile=CMT/CMT$${version}$${branch}.tar; \
+          tar cf $${tarfile} CMT/$${version}/mgr CMT/$${version}/src CMT/$${version}/$${branch} ; \
           gzip $${tarfile}; \
-          ${CMTROOT}/mgr/cmt_export.sh $${package}/ $${tarfile}.gz $${tag} ; \
+          ${CMTROOT}/mgr/cmt_export.sh CMT/ $${tarfile}.gz $${tag} ; \
         done
 
@@ -283 +287 @@
 # Construct the kits
 #----------------------------------------------------------
-Export :: srctar bintar
+Export :: docs srctar bintar
         @echo Export done
 

CMT/HEAD/mgr/cmt.nmake

@@ -3 +3 @@
 #  Application cmt
 #
-#   Generated Mon Oct 17 11:37:01 2005  by ARNAULT
+#   Generated Tue Oct 18 09:41:36 2005  by ARNAULT
 #
 #====================================