jcarr
/
coriolis
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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.
This commit is contained in:
Jean-Paul Chaput 2010-05-27 11:54:24 +00:00
parent 26b7fa24eb
commit 736d3346e4
3 changed files with 155 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
bootstrap/buildCoriolis.py
View File

@ -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 ]

163
bootstrap/coriolis2-for-distribution.patch
View File

@ -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 @@
<?xml version="1.0"?>
<environment>
- <variable name="CELL_TOP" value="/opt/alliance-5.0"/>
+ <variable name="CELL_TOP" value="/usr/share/alliance"/>
<technologies>
<hurricane>
- <config>${CORIOLIS_TOP}/etc/coriolis2/technology.symbolic.xml</config>
+ <config>/etc/coriolis2/technology.symbolic.xml</config>
</hurricane>
<real>
- <config>${CORIOLIS_TOP}/etc/coriolis2/technology.hcmos9.s2r.xml</config>
+ <config>/etc/coriolis2/technology.hcmos9.s2r.xml</config>
</real>
<lef>
- <config>${CORIOLIS_TOP}/etc/coriolis2/cmos.lef</config>
+ <config>/etc/coriolis2/cmos.lef</config>
</lef>
<display>
- <config>${CORIOLIS_TOP}/etc/coriolis2/display.xml</config>
+ <config>/etc/coriolis2/display.xml</config>
</display>
</technologies>
<libraries>
--- 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 @@
<?xml version="1.0"?>
<environment>
- <variable name="CELL_TOP" value="/opt/alliance-5.0"/>
+ <variable name="CELL_TOP" value="/usr/share/alliance"/>
<technologies>
<hurricane>
- <config>${CORIOLIS_TOP}/etc/coriolis2/technology.symbolic.xml</config>
+ <config>/etc/coriolis2/technology.symbolic.xml</config>
</hurricane>
<real>
- <config>${CORIOLIS_TOP}/etc/coriolis2/technology.hcmos9.s2r.xml</config>
+ <config>/etc/coriolis2/technology.fake.s2r.xml</config>
</real>
<lef>
- <config>${CORIOLIS_TOP}/etc/coriolis2/cmos.lef</config>
+ <config>/etc/coriolis2/cmos.lef</config>
</lef>
<display>
- <config>${CORIOLIS_TOP}/etc/coriolis2/display.xml</config>
+ <config>/etc/coriolis2/display.xml</config>
</display>
</technologies>
<libraries>
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 @@
-<?xml version="1.0"?>
-<technology>
- <real>
- <name>hcmos9</name>
- <grid value="0.005" unit="micron"/>
- <gridsperlambda value="24"/>
- <layers>
- <!-- Non routing layers -->
- <processlayer symbolic="nWell" real="NWELL" gdsII="3" />
- <processlayer symbolic="nImplant" real="NPLUS" gdsII="26"/>
- <processlayer symbolic="pImplant" real="PPLUS" gdsII="25"/>
- <processlayer symbolic="active" real="ACTIVE" gdsII="6" />
- <processlayer symbolic="poly" real="POLY" gdsII="17"/>
- <!-- Routing layers -->
- <processlayer symbolic="cut0" real="CONTACT" gdsII="30"/>
- <processlayer symbolic="metal1" real="METAL1" gdsII="31"/>
- <processlayer symbolic="cut1" real="VIA1" gdsII="51"/>
- <processlayer symbolic="metal2" real="METAL2" gdsII="32"/>
- <processlayer symbolic="cut2" real="VIA2" gdsII="52"/>
- <processlayer symbolic="metal3" real="METAL3" gdsII="33"/>
- <processlayer symbolic="cut3" real="VIA3" gdsII="53"/>
- <processlayer symbolic="metal4" real="METAL4" gdsII="34"/>
- <processlayer symbolic="cut4" real="VIA4" gdsII="54"/>
- <processlayer symbolic="metal5" real="METAL5" gdsII="35"/>
- <processlayer symbolic="cut5" real="VIA5" gdsII="55"/>
- <processlayer symbolic="metal6" real="METAL6" gdsII="36"/>
- </layers>
- </real>
-</technology>
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 @@
-<?xml version="1.0"?>
-<technology>
- <real>
- <name>cmos065</name>
- <grid value="0.005" unit="micron"/>
- <gridsperlambda value="24"/>
- <layers>
- <!-- Non routing layers -->
- <processlayer symbolic="nWell" real="NW" gdsII="3" />
- <processlayer symbolic="nImplant" real="NP" gdsII="26"/>
- <processlayer symbolic="pImplant" real="PP" gdsII="25"/>
- <processlayer symbolic="active" real="OD" gdsII="6" />
- <processlayer symbolic="poly" real="PO" gdsII="17"/>
- <!-- Routing layers -->
- <processlayer symbolic="cut0" real="CO" gdsII="30"/>
- <processlayer symbolic="metal1" real="M1" gdsII="31"/>
- <processlayer symbolic="cut1" real="VIA1X" gdsII="51"/>
- <processlayer symbolic="metal2" real="M2X" gdsII="32"/>
- <processlayer symbolic="cut2" real="VIA2X" gdsII="52"/>
- <processlayer symbolic="metal3" real="M3X" gdsII="33"/>
- <processlayer symbolic="cut3" real="VIA3X" gdsII="53"/>
- <processlayer symbolic="metal4" real="M4X" gdsII="34"/>
- <processlayer symbolic="cut4" real="VIA4X" gdsII="54"/>
- <processlayer symbolic="metal5" real="M5X" gdsII="35"/>
- <processlayer symbolic="cut5" real="VIA5X" gdsII="55"/>
- <processlayer symbolic="metal6" real="M6X" gdsII="36"/>
- </layers>
- </real>
-</technology>
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 @@
-<?xml version="1.0"?>
-<technology>
- <real>
- <name>freePDK45</name>
- <grid value="0.0025" unit="micron"/>
- <gridsperlambda value="24"/>
- <layers>
- <!-- Non routing layers -->
- <processlayer symbolic="nWell" real="NW" gdsII="3" />
- <processlayer symbolic="nImplant" real="NP" gdsII="26"/>
- <processlayer symbolic="pImplant" real="PP" gdsII="25"/>
- <processlayer symbolic="active" real="OD" gdsII="6" />
- <processlayer symbolic="poly" real="PO" gdsII="17"/>
- <!-- Routing layers -->
- <processlayer symbolic="cut0" real="CO" gdsII="30"/>
- <processlayer symbolic="metal1" real="M1" gdsII="31"/>
- <processlayer symbolic="cut1" real="VIA1X" gdsII="51"/>
- <processlayer symbolic="metal2" real="M2X" gdsII="32"/>
- <processlayer symbolic="cut2" real="VIA2X" gdsII="52"/>
- <processlayer symbolic="metal3" real="M3X" gdsII="33"/>
- <processlayer symbolic="cut3" real="VIA3X" gdsII="53"/>
- <processlayer symbolic="metal4" real="M4X" gdsII="34"/>
- <processlayer symbolic="cut4" real="VIA4X" gdsII="54"/>
- <processlayer symbolic="metal5" real="M5X" gdsII="35"/>
- <processlayer symbolic="cut5" real="VIA5X" gdsII="55"/>
- <processlayer symbolic="metal6" real="M6X" gdsII="36"/>
- </layers>
- </real>
-</technology>

8
bootstrap/coriolis2.spec.in
View File

@ -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 <Jean-Paul.Chaput@lip6.fr>
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 <http://home.eng.iastate.edu/~cnchu>.
%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