[or-cvs] r23806: {arm} Moving build resources out of the trunk and splitting up deb (in arm: resources resources/build resources/build/debian resources/build/redhat trunk)

Damian Johnson atagar1 at gmail.com
Tue Nov 16 15:42:18 UTC 2010


Author: atagar
Date: 2010-11-16 15:42:18 +0000 (Tue, 16 Nov 2010)
New Revision: 23806

Added:
   arm/resources/build/
   arm/resources/build/debian/
   arm/resources/build/redhat/
   arm/resources/build/redhat/MANIFEST
   arm/resources/build/redhat/make-rpm
Removed:
   arm/resources/build/debian/MANIFEST
   arm/resources/build/debian/make-rpm
   arm/trunk/debian/
Modified:
   arm/resources/notes.txt
Log:
Moving build resources out of the trunk and splitting up deb/rpm resources.



Deleted: arm/resources/build/debian/MANIFEST
===================================================================
--- arm/trunk/debian/MANIFEST	2010-11-16 11:15:26 UTC (rev 23803)
+++ arm/resources/build/debian/MANIFEST	2010-11-16 15:42:18 UTC (rev 23806)
@@ -1,40 +0,0 @@
-README
-setup.py
-arm
-arm.1
-armrc.sample
-src/__init__.py
-src/prereq.py
-src/starter.py
-src/version.py
-src/settings.cfg
-src/TorCtl/GeoIPSupport.py
-src/TorCtl/PathSupport.py
-src/TorCtl/SQLSupport.py
-src/TorCtl/ScanSupport.py
-src/TorCtl/StatsSupport.py
-src/TorCtl/TorCtl.py
-src/TorCtl/TorUtil.py
-src/TorCtl/__init__.py
-src/interface/__init__.py
-src/interface/confPanel.py
-src/interface/connPanel.py
-src/interface/controller.py
-src/interface/descriptorPopup.py
-src/interface/fileDescriptorPopup.py
-src/interface/headerPanel.py
-src/interface/logPanel.py
-src/interface/graphing/__init__.py
-src/interface/graphing/bandwidthStats.py
-src/interface/graphing/connStats.py
-src/interface/graphing/graphPanel.py
-src/interface/graphing/psStats.py
-src/util/__init__.py
-src/util/conf.py
-src/util/connections.py
-src/util/hostnames.py
-src/util/log.py
-src/util/panel.py
-src/util/sysTools.py
-src/util/torTools.py
-src/util/uiTools.py

Deleted: arm/resources/build/debian/make-rpm
===================================================================
--- arm/trunk/debian/make-rpm	2010-11-16 11:15:26 UTC (rev 23803)
+++ arm/resources/build/debian/make-rpm	2010-11-16 15:42:18 UTC (rev 23806)
@@ -1,20 +0,0 @@
-#!/bin/sh
-cp debian/MANIFEST ./
-python setup.py bdist_rpm
-
-# cleans up after rpm build
-files="build MANIFEST"
-
-for i in $files 
-do
-  if [ -f $i -o -d $i ]; then
-    rm -rf $i
-    
-    if [ $? = 0 ]; then
-      echo "removed $i"
-    else
-      exit 1
-    fi
-  fi
-done
-

Copied: arm/resources/build/redhat/MANIFEST (from rev 23803, arm/trunk/debian/MANIFEST)
===================================================================
--- arm/resources/build/redhat/MANIFEST	                        (rev 0)
+++ arm/resources/build/redhat/MANIFEST	2010-11-16 15:42:18 UTC (rev 23806)
@@ -0,0 +1,40 @@
+README
+setup.py
+arm
+arm.1
+armrc.sample
+src/__init__.py
+src/prereq.py
+src/starter.py
+src/version.py
+src/settings.cfg
+src/TorCtl/GeoIPSupport.py
+src/TorCtl/PathSupport.py
+src/TorCtl/SQLSupport.py
+src/TorCtl/ScanSupport.py
+src/TorCtl/StatsSupport.py
+src/TorCtl/TorCtl.py
+src/TorCtl/TorUtil.py
+src/TorCtl/__init__.py
+src/interface/__init__.py
+src/interface/confPanel.py
+src/interface/connPanel.py
+src/interface/controller.py
+src/interface/descriptorPopup.py
+src/interface/fileDescriptorPopup.py
+src/interface/headerPanel.py
+src/interface/logPanel.py
+src/interface/graphing/__init__.py
+src/interface/graphing/bandwidthStats.py
+src/interface/graphing/connStats.py
+src/interface/graphing/graphPanel.py
+src/interface/graphing/psStats.py
+src/util/__init__.py
+src/util/conf.py
+src/util/connections.py
+src/util/hostnames.py
+src/util/log.py
+src/util/panel.py
+src/util/sysTools.py
+src/util/torTools.py
+src/util/uiTools.py

Copied: arm/resources/build/redhat/make-rpm (from rev 23803, arm/trunk/debian/make-rpm)
===================================================================
--- arm/resources/build/redhat/make-rpm	                        (rev 0)
+++ arm/resources/build/redhat/make-rpm	2010-11-16 15:42:18 UTC (rev 23806)
@@ -0,0 +1,20 @@
+#!/bin/sh
+cp debian/MANIFEST ./
+python setup.py bdist_rpm
+
+# cleans up after rpm build
+files="build MANIFEST"
+
+for i in $files 
+do
+  if [ -f $i -o -d $i ]; then
+    rm -rf $i
+    
+    if [ $? = 0 ]; then
+      echo "removed $i"
+    else
+      exit 1
+    fi
+  fi
+done
+

Modified: arm/resources/notes.txt
===================================================================
--- arm/resources/notes.txt	2010-11-16 15:36:09 UTC (rev 23805)
+++ arm/resources/notes.txt	2010-11-16 15:42:18 UTC (rev 23806)
@@ -1,4 +1,7 @@
-TorCtl -
+builds -
+  Helper scripts for deb and rpm builds.
+
+TorCtl (dependency) -
   Last Updated: 8/22/10 (c514a0a7105cebe7cc5fa199750b90369b820bfb):
   To update run the following:
     git clone git://git.torproject.org/pytorctl.git



More information about the tor-commits mailing list