Author: glen Date: Tue Jan 18 07:16:43 2011 GMT
Module: packages Tag: HEAD
---- Log message:
- add py3 macros
---- Files affected:
packages:
adapter (1.46 -> 1.47) , adapter.awk (1.481 -> 1.482)
---- Diffs:
================================================================
Index: packages/adapter
diff -u packages/adapter:1.46 packages/adapter:1.47
--- packages/adapter:1.46 Thu Sep 16 23:52:21 2010
+++ packages/adapter Tue Jan 18 08:16:38 2011
@@ -208,6 +208,11 @@
py_scriptdir
py_ver
+ py3_sitescriptdir
+ py3_sitedir
+ py3_scriptdir
+ py3_ver
+
ruby_archdir
ruby_ridir
ruby_rubylibdir
================================================================
Index: packages/adapter.awk
diff -u packages/adapter.awk:1.481 packages/adapter.awk:1.482
--- packages/adapter.awk:1.481 Tue Jan 18 08:12:44 2011
+++ packages/adapter.awk Tue Jan 18 08:16:38 2011
@@ -1570,13 +1570,10 @@
t = substr($0, 0, l);
s = substr($0, l + 1, RLENGTH - l -
length("-py"py_ver".egg-info"));
if (match(s, "[^-]+$")) {
-#printf("s[%s]; start[%d]; length[%d]\n", s, RSTART, RLENGTH);
if (RSTART > 1) {
s = substr(s, 0, RSTART - 1);
}
-#printf("s2[%s]\n", s);
print "%if \"%{py_ver}\" > \"2.4\""
-#print t "/.+.egg-info"
gsub(t "/.+.egg-info", t "/" s "-*.egg-info");
print
print "%endif"
@@ -1821,7 +1818,8 @@
exit(rc = 1);
}
- if (!ENVIRON["ADAPTER_REVISION"] || ENVIRON["ADAPTER_REVISION"] < 1.46)
{
+ # update this version dep each time some new macro export is added
+ if (!ENVIRON["ADAPTER_REVISION"] || ENVIRON["ADAPTER_REVISION"] < 1.47)
{
print "adapter shell script is outdated, please cvs up it" >
"/dev/stderr"
do_not_touch_anything = 1
exit(rc = 1);
@@ -1862,6 +1860,11 @@
py_sitedir = ENVIRON["py_sitedir"]
py_scriptdir = ENVIRON["py_scriptdir"]
py_ver = ENVIRON["py_ver"]
+
+ py3_sitescriptdir = ENVIRON["py3_sitescriptdir"]
+ py3_sitedir = ENVIRON["py3_sitedir"]
+ py3_scriptdir = ENVIRON["py3_scriptdir"]
+ py3_ver = ENVIRON["py3_ver"]
ruby_archdir = ENVIRON["ruby_archdir"]
ruby_ridir = ENVIRON["ruby_ridir"]
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/adapter?r1=1.46&r2=1.47&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/adapter.awk?r1=1.481&r2=1.482&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
