[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]

[vidalia-svn] r2858: Split the CMake fu for pkg/osx, pkg/rpm, and pkg/win32 into (in vidalia/trunk/pkg: . osx rpm win32)

To: vidalia-svn@xxxxxxxx
Subject: [vidalia-svn] r2858: Split the CMake fu for pkg/osx, pkg/rpm, and pkg/win32 into (in vidalia/trunk/pkg: . osx rpm win32)
From: edmanm@xxxxxxxxxxxxxxxxxxx
Date: Sun, 13 Jul 2008 00:29:07 -0400 (EDT)
Delivered-to: archiver@xxxxxxxx
Delivered-to: vidalia-svn-outgoing@xxxxxxxx
Delivered-to: vidalia-svn@xxxxxxxx
Delivery-date: Sun, 13 Jul 2008 00:29:14 -0400
Reply-to: vidalia-svn@xxxxxxxxxxxxx
Sender: owner-vidalia-svn@xxxxxxxxxxxxx

Author: edmanm
Date: 2008-07-13 00:29:06 -0400 (Sun, 13 Jul 2008)
New Revision: 2858

Added:
   vidalia/trunk/pkg/osx/CMakeLists.txt
   vidalia/trunk/pkg/rpm/CMakeLists.txt
   vidalia/trunk/pkg/win32/CMakeLists.txt
Modified:
   vidalia/trunk/pkg/CMakeLists.txt
Log:
Split the CMake fu for pkg/osx, pkg/rpm, and pkg/win32 into their own
CMakeLists.txt files in each subdirectory.


Modified: vidalia/trunk/pkg/CMakeLists.txt
===================================================================
--- vidalia/trunk/pkg/CMakeLists.txt	2008-07-13 04:11:49 UTC (rev 2857)
+++ vidalia/trunk/pkg/CMakeLists.txt	2008-07-13 04:29:06 UTC (rev 2858)
@@ -10,64 +10,12 @@
 ##  the terms described in the LICENSE file.
 ##
 
+add_subdirectory(osx)
+add_subdirectory(rpm)
+add_subdirectory(win32)
 
 configure_file(
   ${CMAKE_CURRENT_SOURCE_DIR}/package.sh
   ${CMAKE_CURRENT_BINARY_DIR}/package.sh
   COPYONLY
 )
-
-## RPM Spec File
-configure_file(
-  ${CMAKE_CURRENT_SOURCE_DIR}/rpm/vidalia.spec.in
-  ${CMAKE_CURRENT_BINARY_DIR}/rpm/vidalia.spec
-)
-
-## OS X Packaging Files
-configure_file(
-  ${CMAKE_CURRENT_SOURCE_DIR}/osx/builddmg.sh.in
-  ${CMAKE_CURRENT_BINARY_DIR}/osx/builddmg.sh
-)
-configure_file(
-  ${CMAKE_CURRENT_SOURCE_DIR}/osx/buildmpkg.sh.in
-  ${CMAKE_CURRENT_BINARY_DIR}/osx/buildmpkg.sh
-)
-configure_file(
-  ${CMAKE_CURRENT_SOURCE_DIR}/osx/VidaliaBundleDesc.plist.in
-  ${CMAKE_CURRENT_BINARY_DIR}/osx/VidaliaBundleDesc.plist
-)
-configure_file(
-  ${CMAKE_CURRENT_SOURCE_DIR}/osx/VidaliaBundleInfo.plist.in
-  ${CMAKE_CURRENT_BINARY_DIR}/osx/VidaliaBundleInfo.plist
-)
-configure_file(
-  ${CMAKE_CURRENT_SOURCE_DIR}/osx/VidaliaDesc.plist.in
-  ${CMAKE_CURRENT_BINARY_DIR}/osx/VidaliaDesc.plist
-)
-configure_file(
-  ${CMAKE_CURRENT_SOURCE_DIR}/osx/VidaliaInfo.plist.in
-  ${CMAKE_CURRENT_BINARY_DIR}/osx/VidaliaInfo.plist
-)
-
-## Windows Packages
-configure_file(
-  ${CMAKE_CURRENT_SOURCE_DIR}/win32/vidalia.nsi.in
-  ${CMAKE_CURRENT_BINARY_DIR}/win32/vidalia.nsi
-  @ONLY
-)
-configure_file(
-  ${CMAKE_CURRENT_SOURCE_DIR}/win32/vidalia-bundle.nsi.in
-  ${CMAKE_CURRENT_BINARY_DIR}/win32/vidalia-bundle.nsi
-  @ONLY
-)
-
-file(GLOB vidalia_NSH ${CMAKE_CURRENT_SOURCE_DIR}/win32/*.nsh)
-foreach (it ${vidalia_NSH})
-  get_filename_component(it ${it} NAME)
-  configure_file(
-    ${CMAKE_CURRENT_SOURCE_DIR}/win32/${it}
-    ${CMAKE_CURRENT_BINARY_DIR}/win32/${it} 
-    COPYONLY
-  )
-endforeach(it)
-

Added: vidalia/trunk/pkg/osx/CMakeLists.txt
===================================================================
--- vidalia/trunk/pkg/osx/CMakeLists.txt	                        (rev 0)
+++ vidalia/trunk/pkg/osx/CMakeLists.txt	2008-07-13 04:29:06 UTC (rev 2858)
@@ -0,0 +1,37 @@
+##
+##  $Id$
+## 
+##  This file is part of Vidalia, and is subject to the license terms in the
+##  LICENSE file, found in the top level directory of this distribution. If 
+##  you did not receive the LICENSE file with this file, you may obtain it
+##  from the Vidalia source package distributed by the Vidalia Project at
+##  http://www.vidalia-project.net/. No part of Vidalia, including this file,
+##  may be copied, modified, propagated, or distributed except according to
+##  the terms described in the LICENSE file.
+##
+
+## OS X Packaging Files
+configure_file(
+  ${CMAKE_CURRENT_SOURCE_DIR}/builddmg.sh.in
+  ${CMAKE_CURRENT_BINARY_DIR}/builddmg.sh
+)
+configure_file(
+  ${CMAKE_CURRENT_SOURCE_DIR}/buildmpkg.sh.in
+  ${CMAKE_CURRENT_BINARY_DIR}/buildmpkg.sh
+)
+configure_file(
+  ${CMAKE_CURRENT_SOURCE_DIR}/VidaliaBundleDesc.plist.in
+  ${CMAKE_CURRENT_BINARY_DIR}/VidaliaBundleDesc.plist
+)
+configure_file(
+  ${CMAKE_CURRENT_SOURCE_DIR}/VidaliaBundleInfo.plist.in
+  ${CMAKE_CURRENT_BINARY_DIR}/VidaliaBundleInfo.plist
+)
+configure_file(
+  ${CMAKE_CURRENT_SOURCE_DIR}/VidaliaDesc.plist.in
+  ${CMAKE_CURRENT_BINARY_DIR}/VidaliaDesc.plist
+)
+configure_file(
+  ${CMAKE_CURRENT_SOURCE_DIR}/VidaliaInfo.plist.in
+  ${CMAKE_CURRENT_BINARY_DIR}/VidaliaInfo.plist
+)


Property changes on: vidalia/trunk/pkg/osx/CMakeLists.txt
___________________________________________________________________
Name: svn:keywords
   + Id
Name: svn:eol-style
   + native

Added: vidalia/trunk/pkg/rpm/CMakeLists.txt
===================================================================
--- vidalia/trunk/pkg/rpm/CMakeLists.txt	                        (rev 0)
+++ vidalia/trunk/pkg/rpm/CMakeLists.txt	2008-07-13 04:29:06 UTC (rev 2858)
@@ -0,0 +1,17 @@
+##
+##  $Id$
+## 
+##  This file is part of Vidalia, and is subject to the license terms in the
+##  LICENSE file, found in the top level directory of this distribution. If 
+##  you did not receive the LICENSE file with this file, you may obtain it
+##  from the Vidalia source package distributed by the Vidalia Project at
+##  http://www.vidalia-project.net/. No part of Vidalia, including this file,
+##  may be copied, modified, propagated, or distributed except according to
+##  the terms described in the LICENSE file.
+##
+
+## RPM Spec File
+configure_file(
+  ${CMAKE_CURRENT_SOURCE_DIR}/vidalia.spec.in
+  ${CMAKE_CURRENT_BINARY_DIR}/vidalia.spec
+)


Property changes on: vidalia/trunk/pkg/rpm/CMakeLists.txt
___________________________________________________________________
Name: svn:keywords
   + Id
Name: svn:eol-style
   + native

Added: vidalia/trunk/pkg/win32/CMakeLists.txt
===================================================================
--- vidalia/trunk/pkg/win32/CMakeLists.txt	                        (rev 0)
+++ vidalia/trunk/pkg/win32/CMakeLists.txt	2008-07-13 04:29:06 UTC (rev 2858)
@@ -0,0 +1,33 @@
+##
+##  $Id$
+## 
+##  This file is part of Vidalia, and is subject to the license terms in the
+##  LICENSE file, found in the top level directory of this distribution. If 
+##  you did not receive the LICENSE file with this file, you may obtain it
+##  from the Vidalia source package distributed by the Vidalia Project at
+##  http://www.vidalia-project.net/. No part of Vidalia, including this file,
+##  may be copied, modified, propagated, or distributed except according to
+##  the terms described in the LICENSE file.
+##
+
+## Windows Packages
+configure_file(
+  ${CMAKE_CURRENT_SOURCE_DIR}/vidalia.nsi.in
+  ${CMAKE_CURRENT_BINARY_DIR}/vidalia.nsi
+  @ONLY
+)
+configure_file(
+  ${CMAKE_CURRENT_SOURCE_DIR}/vidalia-bundle.nsi.in
+  ${CMAKE_CURRENT_BINARY_DIR}/vidalia-bundle.nsi
+  @ONLY
+)
+
+file(GLOB vidalia_NSH ${CMAKE_CURRENT_SOURCE_DIR}/*.nsh)
+foreach (it ${vidalia_NSH})
+  get_filename_component(it ${it} NAME)
+  configure_file(
+    ${CMAKE_CURRENT_SOURCE_DIR}/${it}
+    ${CMAKE_CURRENT_BINARY_DIR}/${it} 
+    COPYONLY
+  )
+endforeach(it)


Property changes on: vidalia/trunk/pkg/win32/CMakeLists.txt
___________________________________________________________________
Name: svn:keywords
   + Id
Name: svn:eol-style
   + native

Prev by Author: [vidalia-svn] r2857: msginit apparently ignores the charset specified in the POT' (vidalia/trunk/pkg/win32/en)
Next by Author: [vidalia-svn] r2859: Remember the location of po2nsh so we can use it in custom c (vidalia/trunk/src/tools/po2nsh)
Previous by thread: [vidalia-svn] r2857: msginit apparently ignores the charset specified in the POT' (vidalia/trunk/pkg/win32/en)
Next by thread: [vidalia-svn] r2859: Remember the location of po2nsh so we can use it in custom c (vidalia/trunk/src/tools/po2nsh)
Index(es):
- Author
- Thread