Changeset 560 in xpra

Timestamp:

02/28/12 10:57:10 (15 months ago)

Author:

antoine

Message:

#83: don't modify a file in the source tree, delete it, svn:ignore it, and generate it only when needed (make-src-snapshot and during build)
Also ensure the file has default values if somehow we fail to detect svn values (see add_build_info.py)

Location:

trunk

Files:

• scripts/make-src-snapshot.sh (modified) (2 diffs)
• src/add_build_info.py (modified) (1 diff)
• src/xpra (modified) (1 prop)
• src/xpra/build_info.py (deleted)

trunk/scripts/make-src-snapshot.sh

@@ -6 +6 @@
 fi
 DIR=xpra-${VERSION}
-svn revert "src/xpra/build_info.py"
+rm -f "src/xpra/build_info.py"
 cp -apr src ${DIR}
 rm -fr "${DIR}/build"
@@ -14 +14 @@
 rm -fr "${DIR}/wimpiggy/lowlevel/constants.pxi"
 pushd "${DIR}"
-python -c "from add_build_info import append_svn_props; append_svn_props()"
+svn info > ./svn-info
 popd
 find ${DIR} -name ".svn" -exec rm -fr {} \; 2>&1 | grep -v "No such file or directory"

trunk/src/add_build_info.py

@@ -13 +13 @@
 
 def get_svn_props():
-    props = {}
+    props = {
+                "REVISION" : "unknown",
+                "LOCAL_MODIFICATIONS" : "unknown"
+            }
     #find revision:
     proc = subprocess.Popen("svnversion -n", stdin=None, stdout=subprocess.PIPE, stderr=subprocess.PIPE, shell=True)

trunk/src/xpra

@@ -1 +1 @@
 wait_for_x_server.c
+build_info.py

@@ -1 +1 @@
 wait_for_x_server.c
+build_info.py

@@ -1 +1 @@
 wait_for_x_server.c
+build_info.py