From 736d3346e4dfd2597b134717b6c338da546e454e Mon Sep 17 00:00:00 2001 From: Jean-Paul Chaput Date: Thu, 27 May 2010 11:54:24 +0000 Subject: [PATCH] Patch for distribution is now applied *before* generating the archive so that unwanted files are not includeds in the source package. Adds mention to the Flute LICENSE in the code. --- bootstrap/buildCoriolis.py | 21 ++- bootstrap/coriolis2-for-distribution.patch | 163 +++++++++++++++++---- bootstrap/coriolis2.spec.in | 8 +- 3 files changed, 155 insertions(+), 37 deletions(-) diff --git a/bootstrap/buildCoriolis.py b/bootstrap/buildCoriolis.py index 6be10ada..d8da542d 100755 --- a/bootstrap/buildCoriolis.py +++ b/bootstrap/buildCoriolis.py @@ -449,13 +449,21 @@ class ProjectBuilder: os.makedirs ( self._tarballDir ) self.svnExport ( tools, projects ) - # Remove unpublisheds (yet) parsers/drivers. - command = [ "/bin/rm", "-r", os.path.join(self._archiveDir,"vlsisapd","openChams") ] - self._execute ( command, "rm command failed" ) + removeds = [ os.path.join("vlsisapd","openChams") + , os.path.join("vlsisapd","dtr") + ] - command = [ "/bin/rm", "-r", os.path.join(self._archiveDir,"vlsisapd","dtr") ] - self._execute ( command, "rm command failed" ) + # Remove unpublisheds (yet) tools/files. + for item in removeds: + command = [ "/bin/rm", "-r", os.path.join(self._archiveDir,item) ] + self._execute ( command, "rm of %s failed" % item) + os.chdir ( self._archiveDir ) + command = [ "/bin/patch", "--remove-empty-files" + , "--no-backup-if-mismatch" + , "-p0", "-i", self._distribPatch ] + self._execute ( command, "patch for distribution command failed" ) + os.chdir ( self._tarballDir ) command = [ "/bin/tar", "jcvf", self._sourceTarBz2, os.path.basename(self._archiveDir) ] self._execute ( command, "tar command failed" ) @@ -472,7 +480,6 @@ class ProjectBuilder: rpmSpecFile = os.path.join ( self._rpmTopDir, "SPECS/coriolis2.spec" ) rpmSourceFile = os.path.join ( self._rpmTopDir, "SOURCES", self._sourceTarBz2 ) - rpmPatchFile = os.path.join ( self._rpmTopDir, "SOURCES", "coriolis2-for-distribution.patch" ) sourceFile = os.path.join ( self._tarballDir, self._sourceTarBz2 ) @@ -482,8 +489,6 @@ class ProjectBuilder: if not os.path.islink ( rpmSourceFile ): os.symlink ( sourceFile, rpmSourceFile ) - if not os.path.islink ( rpmPatchFile ): - os.symlink ( self._distribPatch, rpmPatchFile ) os.chdir ( os.path.join ( os.environ["HOME"], "rpm" ) ) command = [ "/usr/bin/rpmbuild", "-ba", "--with", "binarytar", rpmSpecFile ] diff --git a/bootstrap/coriolis2-for-distribution.patch b/bootstrap/coriolis2-for-distribution.patch index 405ac247..4de47c57 100644 --- a/bootstrap/coriolis2-for-distribution.patch +++ b/bootstrap/coriolis2-for-distribution.patch @@ -1,29 +1,3 @@ ---- crlcore/etc/environment.alliance.xml.soc 2010-05-22 11:00:46.000000000 +0200 -+++ crlcore/etc/environment.alliance.xml 2010-05-22 11:02:18.000000000 +0200 -@@ -1,18 +1,18 @@ - - -- -+ - - -- ${CORIOLIS_TOP}/etc/coriolis2/technology.symbolic.xml -+ /etc/coriolis2/technology.symbolic.xml - - -- ${CORIOLIS_TOP}/etc/coriolis2/technology.hcmos9.s2r.xml -+ /etc/coriolis2/technology.hcmos9.s2r.xml - - -- ${CORIOLIS_TOP}/etc/coriolis2/cmos.lef -+ /etc/coriolis2/cmos.lef - - -- ${CORIOLIS_TOP}/etc/coriolis2/display.xml -+ /etc/coriolis2/display.xml - - - --- unicorn/src/CgtMain.cpp.soc 2010-05-26 09:50:43.000000000 +0200 +++ unicorn/src/CgtMain.cpp 2010-05-26 09:52:22.000000000 +0200 @@ -66,36 +66,6 @@ @@ -76,3 +50,140 @@ ( "verbose,v" , poptions::bool_switch(&verbose1)->default_value(false) , "First level of verbosity.") ( "very-verbose,V" , poptions::bool_switch(&verbose2)->default_value(false) +diff --exclude=.svn -uNr crlcore/etc.soc/CMakeLists.txt crlcore/etc/CMakeLists.txt +--- crlcore/etc.soc/CMakeLists.txt 2010-05-27 13:37:15.000000000 +0200 ++++ crlcore/etc/CMakeLists.txt 2010-05-27 13:37:57.000000000 +0200 +@@ -1,7 +1,4 @@ + install ( FILES environment.alliance.xml DESTINATION ${SYS_CONF_DIR}/coriolis2 ) + install ( FILES technology.symbolic.xml DESTINATION ${SYS_CONF_DIR}/coriolis2 ) +- install ( FILES technology.cmos130.s2r.xml DESTINATION ${SYS_CONF_DIR}/coriolis2 ) +- install ( FILES technology.mos65.s2r.xml DESTINATION ${SYS_CONF_DIR}/coriolis2 ) +- install ( FILES technology.freePDK45.s2r.xml DESTINATION ${SYS_CONF_DIR}/coriolis2 ) + install ( FILES technology.fake.s2r.xml DESTINATION ${SYS_CONF_DIR}/coriolis2 ) + install ( FILES display.xml DESTINATION ${SYS_CONF_DIR}/coriolis2 ) +diff --exclude=.svn -uNr crlcore/etc.soc/environment.alliance.xml crlcore/etc/environment.alliance.xml +--- crlcore/etc.soc/environment.alliance.xml 2010-05-22 11:00:46.000000000 +0200 ++++ crlcore/etc/environment.alliance.xml 2010-05-27 13:38:57.000000000 +0200 +@@ -1,18 +1,18 @@ + + +- ++ + + +- ${CORIOLIS_TOP}/etc/coriolis2/technology.symbolic.xml ++ /etc/coriolis2/technology.symbolic.xml + + +- ${CORIOLIS_TOP}/etc/coriolis2/technology.hcmos9.s2r.xml ++ /etc/coriolis2/technology.fake.s2r.xml + + +- ${CORIOLIS_TOP}/etc/coriolis2/cmos.lef ++ /etc/coriolis2/cmos.lef + + +- ${CORIOLIS_TOP}/etc/coriolis2/display.xml ++ /etc/coriolis2/display.xml + + + +diff --exclude=.svn -uNr crlcore/etc.soc/technology.cmos130.s2r.xml crlcore/etc/technology.cmos130.s2r.xml +--- crlcore/etc.soc/technology.cmos130.s2r.xml 2010-05-27 13:35:07.000000000 +0200 ++++ crlcore/etc/technology.cmos130.s2r.xml 1970-01-01 01:00:00.000000000 +0100 +@@ -1,29 +0,0 @@ +- +- +- +- hcmos9 +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +diff --exclude=.svn -uNr crlcore/etc.soc/technology.cmos65.s2r.xml crlcore/etc/technology.cmos65.s2r.xml +--- crlcore/etc.soc/technology.cmos65.s2r.xml 2010-05-27 13:35:07.000000000 +0200 ++++ crlcore/etc/technology.cmos65.s2r.xml 1970-01-01 01:00:00.000000000 +0100 +@@ -1,29 +0,0 @@ +- +- +- +- cmos065 +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +diff --exclude=.svn -uNr crlcore/etc.soc/technology.freePDK45.s2r.xml crlcore/etc/technology.freePDK45.s2r.xml +--- crlcore/etc.soc/technology.freePDK45.s2r.xml 2010-04-23 15:26:06.000000000 +0200 ++++ crlcore/etc/technology.freePDK45.s2r.xml 1970-01-01 01:00:00.000000000 +0100 +@@ -1,29 +0,0 @@ +- +- +- +- freePDK45 +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- diff --git a/bootstrap/coriolis2.spec.in b/bootstrap/coriolis2.spec.in index b6816616..bf6e50ef 100644 --- a/bootstrap/coriolis2.spec.in +++ b/bootstrap/coriolis2.spec.in @@ -23,10 +23,9 @@ Name: coriolis2 Summary: Coriolis 2 VLSI CAD Sytem Version: %{coriolisVersion}.%{svntag} Release: 1%{dist} -License: LGPL/GPL +License: BSD/LGPL/GPL Group: Applications/Engineering Source: %{name}-%{version}.tar.bz2 -Patch0: coriolis2-for-distribution.patch URL: http://www-asim.lip6.fr/ Packager: Jean-Paul Chaput Requires(post): ldconfig @@ -41,6 +40,10 @@ BuildRoot: %{_tmppath}/root-%{name} Coriolis is the new CAD tool suite intended to replace the physical backend flow of Alliance. +The Knik global router makes use of FLUTE, which is redistributed +under is own license. FLUTE is copyrighted by Dr. Chris C. N. Chu +from the Iowa State University . + %package devel Summary: Coriolis 2 VLSI CAD Sytem - Development @@ -55,7 +58,6 @@ Development files for the Coriolis 2 package. %prep %setup -%patch0 -p0 -b .soc %build