Date: Saturday, May 26, 2012 @ 03:41:12
  Author: andrea
Revision: 159700

archrelease: copy trunk to staging-i686, staging-x86_64

Added:
  kdelibs/repos/staging-i686/
  kdelibs/repos/staging-i686/PKGBUILD
    (from rev 159699, kdelibs/trunk/PKGBUILD)
  kdelibs/repos/staging-i686/archlinux-menu.patch
    (from rev 159699, kdelibs/trunk/archlinux-menu.patch)
  kdelibs/repos/staging-i686/kde-applications-menu.patch
    (from rev 159699, kdelibs/trunk/kde-applications-menu.patch)
  kdelibs/repos/staging-i686/kdelibs.install
    (from rev 159699, kdelibs/trunk/kdelibs.install)
  kdelibs/repos/staging-i686/use-pythondontwritebytecode.patch
    (from rev 159699, kdelibs/trunk/use-pythondontwritebytecode.patch)
  kdelibs/repos/staging-x86_64/
  kdelibs/repos/staging-x86_64/PKGBUILD
    (from rev 159699, kdelibs/trunk/PKGBUILD)
  kdelibs/repos/staging-x86_64/archlinux-menu.patch
    (from rev 159699, kdelibs/trunk/archlinux-menu.patch)
  kdelibs/repos/staging-x86_64/kde-applications-menu.patch
    (from rev 159699, kdelibs/trunk/kde-applications-menu.patch)
  kdelibs/repos/staging-x86_64/kdelibs.install
    (from rev 159699, kdelibs/trunk/kdelibs.install)
  kdelibs/repos/staging-x86_64/use-pythondontwritebytecode.patch
    (from rev 159699, kdelibs/trunk/use-pythondontwritebytecode.patch)

--------------------------------------------------+
 staging-i686/PKGBUILD                            |   61 ++++++++++++++++
 staging-i686/archlinux-menu.patch                |   22 +++++
 staging-i686/kde-applications-menu.patch         |   22 +++++
 staging-i686/kdelibs.install                     |   13 +++
 staging-i686/use-pythondontwritebytecode.patch   |   80 +++++++++++++++++++++
 staging-x86_64/PKGBUILD                          |   61 ++++++++++++++++
 staging-x86_64/archlinux-menu.patch              |   22 +++++
 staging-x86_64/kde-applications-menu.patch       |   22 +++++
 staging-x86_64/kdelibs.install                   |   13 +++
 staging-x86_64/use-pythondontwritebytecode.patch |   80 +++++++++++++++++++++
 10 files changed, 396 insertions(+)

Copied: kdelibs/repos/staging-i686/PKGBUILD (from rev 159699, 
kdelibs/trunk/PKGBUILD)
===================================================================
--- staging-i686/PKGBUILD                               (rev 0)
+++ staging-i686/PKGBUILD       2012-05-26 07:41:12 UTC (rev 159700)
@@ -0,0 +1,61 @@
+# $Id$
+# Maintainer: Andrea Scarpino <and...@archlinux.org
+# Contributor: Pierre Schmitz <pie...@archlinux.de>
+
+pkgname=kdelibs
+pkgver=4.8.3
+pkgrel=2
+pkgdesc="KDE Core Libraries"
+arch=('i686' 'x86_64')
+url='http://www.kde.org'
+license=('GPL' 'LGPL' 'FDL')
+depends=('strigi' 'attica' 'libxss' 'soprano' 'krb5' 'grantlee'
+        'shared-desktop-ontologies' 'qca' 'libdbusmenu-qt' 'polkit-qt'
+        'shared-mime-info' 'enchant' 'giflib' 'jasper' 'openexr'
+        'docbook-xsl' 'upower' 'udisks' 'libxcursor' 'phonon' 'qtwebkit'
+        'media-player-info' 'herqq')
+makedepends=('cmake' 'automoc4' 'avahi' 'libgl' 'hspell')
+install=${pkgname}.install
+source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz";
+        'kde-applications-menu.patch' 'archlinux-menu.patch'
+        'use-pythondontwritebytecode.patch')
+sha1sums=('50633efa4ea2a133e51bf55286ff754c46f2eae2'
+          '86ee8c8660f19de8141ac99cd6943964d97a1ed7'
+          '63a850ab4196b9d06934f2b4a13acd9f7739bc67'
+          'a1e35760d5b4e29471ad357c963a343c67200f32')
+
+build() {
+       cd "${srcdir}"/${pkgname}-${pkgver}
+
+       # avoid file conflict with gnome-menus
+       patch -p1 -i "${srcdir}"/kde-applications-menu.patch
+       # add Archlinux menu entry
+       patch -p1 -i "${srcdir}"/archlinux-menu.patch
+
+       # Set PYTHONDONTWRITEBYTECODE (KDEBUG#276151)
+       patch -p0 -i "${srcdir}"/use-pythondontwritebytecode.patch
+
+       cd "${srcdir}"
+       mkdir build
+       cd build
+       cmake ../${pkgname}-${pkgver} \
+               -DCMAKE_BUILD_TYPE=Release \
+               -DCMAKE_SKIP_RPATH=ON \
+               -DKDE_DISTRIBUTION_TEXT='Arch Linux' \
+               -DCMAKE_INSTALL_PREFIX=/usr \
+               -DSYSCONF_INSTALL_DIR=/etc \
+               -DHTML_INSTALL_DIR=/usr/share/doc/kde/html \
+               -DKDE_DEFAULT_HOME='.kde4' \
+               -DWITH_FAM=OFF
+       make
+}
+
+package() {
+       cd "${srcdir}"/build
+       make DESTDIR="${pkgdir}" install
+
+       # cert bundle seems to be hardcoded
+       # link it to the one from ca-certificates
+       rm -f "${pkgdir}"/usr/share/apps/kssl/ca-bundle.crt
+       ln -sf /etc/ssl/certs/ca-certificates.crt 
"${pkgdir}"/usr/share/apps/kssl/ca-bundle.crt
+}

Copied: kdelibs/repos/staging-i686/archlinux-menu.patch (from rev 159699, 
kdelibs/trunk/archlinux-menu.patch)
===================================================================
--- staging-i686/archlinux-menu.patch                           (rev 0)
+++ staging-i686/archlinux-menu.patch   2012-05-26 07:41:12 UTC (rev 159700)
@@ -0,0 +1,22 @@
+--- kdelibs-4.3.98/kded/applications.menu      2010-01-31 19:28:11.000000000 
+0000
++++ kdelibs-4.3.98/kded/applications.menu      2010-01-31 22:25:53.556043077 
+0000
+@@ -16,11 +16,19 @@
+       </DefaultLayout>
+       <Layout>
+               <Merge type="menus"/>
++              <Menuname>Arch Linux</Menuname>
+               <Menuname>Applications</Menuname>
+               <Merge type="files"/>
+       </Layout>
+ 
+       <Menu>
++              <Name>Arch Linux</Name>                                         
                                                          
++              <Directory>Archlinux.directory</Directory>                      
                                                         
++              <Include>                                                       
                                                         
++                      <Category>Archlinux</Category>                          
                                                                 
++              </Include>
++      </Menu>
++      <Menu>
+               <Name>Applications</Name>
+               <Directory>kde-unknown.directory</Directory>
+               <OnlyUnallocated/>

Copied: kdelibs/repos/staging-i686/kde-applications-menu.patch (from rev 
159699, kdelibs/trunk/kde-applications-menu.patch)
===================================================================
--- staging-i686/kde-applications-menu.patch                            (rev 0)
+++ staging-i686/kde-applications-menu.patch    2012-05-26 07:41:12 UTC (rev 
159700)
@@ -0,0 +1,22 @@
+--- kdelibs-4.3.98/kded/CMakeLists.txt 2009-10-02 14:55:17.000000000 +0000
++++ kdelibs-4.3.98/kded/CMakeLists.txt 2010-01-31 22:16:13.946933892 +0000
+@@ -69,7 +69,7 @@
+ if (WIN32)
+ install( FILES applications.menu  DESTINATION  
${SHARE_INSTALL_PREFIX}/xdg/menus )
+ else (WIN32)
+-install( FILES applications.menu  DESTINATION  
${SYSCONF_INSTALL_DIR}/xdg/menus )
++install( FILES applications.menu  DESTINATION  
${SYSCONF_INSTALL_DIR}/xdg/menus RENAME kde-applications.menu )
+ endif (WIN32)
+ install( FILES kdedmodule.desktop DESTINATION  ${SERVICETYPES_INSTALL_DIR} )
+ install( FILES kded.upd           DESTINATION  
${DATA_INSTALL_DIR}/kconf_update )
+--- kdelibs-4.3.98/kded/kbuildsycoca.cpp       2009-12-04 23:10:18.000000000 
+0000
++++ kdelibs-4.3.98/kded/kbuildsycoca.cpp       2010-01-31 22:16:13.962766572 
+0000
+@@ -302,7 +302,7 @@
+      if (!m_trackId.isEmpty())
+         g_vfolder->setTrackId(m_trackId);
+ 
+-     VFolderMenu::SubMenu *kdeMenu = 
g_vfolder->parseMenu("applications.menu", true);
++     VFolderMenu::SubMenu *kdeMenu = 
g_vfolder->parseMenu("kde-applications.menu", true);
+ 
+      KServiceGroup::Ptr entry = g_bsgf->addNew("/", kdeMenu->directoryFile, 
KServiceGroup::Ptr(), false);
+      entry->setLayoutInfo(kdeMenu->layoutList);

Copied: kdelibs/repos/staging-i686/kdelibs.install (from rev 159699, 
kdelibs/trunk/kdelibs.install)
===================================================================
--- staging-i686/kdelibs.install                                (rev 0)
+++ staging-i686/kdelibs.install        2012-05-26 07:41:12 UTC (rev 159700)
@@ -0,0 +1,13 @@
+post_install() {
+       xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+       update-mime-database usr/share/mime &> /dev/null
+    update-desktop-database -q
+}
+
+post_upgrade() {
+       post_install
+}
+
+post_remove() {
+       post_install
+}

Copied: kdelibs/repos/staging-i686/use-pythondontwritebytecode.patch (from rev 
159699, kdelibs/trunk/use-pythondontwritebytecode.patch)
===================================================================
--- staging-i686/use-pythondontwritebytecode.patch                              
(rev 0)
+++ staging-i686/use-pythondontwritebytecode.patch      2012-05-26 07:41:12 UTC 
(rev 159700)
@@ -0,0 +1,80 @@
+--- cmake/modules/PythonMacros.cmake
++++ cmake/modules/PythonMacros.cmake
+@@ -23,40 +23,42 @@
+   # Install the source file.
+   INSTALL(FILES ${SOURCE_FILE} DESTINATION ${DESINATION_DIR})
+ 
+-  # Byte compile and install the .pyc file.        
+-  GET_FILENAME_COMPONENT(_absfilename ${SOURCE_FILE} ABSOLUTE)
+-  GET_FILENAME_COMPONENT(_filename ${SOURCE_FILE} NAME)
+-  GET_FILENAME_COMPONENT(_filenamebase ${SOURCE_FILE} NAME_WE)
+-  GET_FILENAME_COMPONENT(_basepath ${SOURCE_FILE} PATH)
+-
+-  if(WIN32)
+-    string(REGEX REPLACE ".:/" "/" _basepath "${_basepath}")
+-  endif(WIN32)
+-
+-  SET(_bin_py ${CMAKE_CURRENT_BINARY_DIR}/${_basepath}/${_filename})
+-  SET(_bin_pyc ${CMAKE_CURRENT_BINARY_DIR}/${_basepath}/${_filenamebase}.pyc)
+-
+-  FILE(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/${_basepath})
+-
+-  SET(_message "-DMESSAGE=Byte-compiling ${_bin_py}")
+-
+-  GET_FILENAME_COMPONENT(_abs_bin_py ${_bin_py} ABSOLUTE)
+-  IF(_abs_bin_py STREQUAL ${_absfilename})    # Don't copy the file onto 
itself.
+-    ADD_CUSTOM_COMMAND(
+-      TARGET compile_python_files
+-      COMMAND ${CMAKE_COMMAND} -E echo ${message}
+-      COMMAND ${PYTHON_EXECUTABLE} ${_python_compile_py} ${_bin_py}
+-      DEPENDS ${_absfilename}
+-    )
+-  ELSE(_abs_bin_py STREQUAL ${_absfilename})
+-    ADD_CUSTOM_COMMAND(
+-      TARGET compile_python_files
+-      COMMAND ${CMAKE_COMMAND} -E echo ${message} 
+-      COMMAND ${CMAKE_COMMAND} -E copy ${_absfilename} ${_bin_py}
+-      COMMAND ${PYTHON_EXECUTABLE} ${_python_compile_py} ${_bin_py}
+-      DEPENDS ${_absfilename}
+-    )
+-  ENDIF(_abs_bin_py STREQUAL ${_absfilename})
++  # Byte compile and install the .pyc file.
++  IF("$ENV{PYTHONDONTWRITEBYTECODE}" STREQUAL "")
++    GET_FILENAME_COMPONENT(_absfilename ${SOURCE_FILE} ABSOLUTE)
++    GET_FILENAME_COMPONENT(_filename ${SOURCE_FILE} NAME)
++    GET_FILENAME_COMPONENT(_filenamebase ${SOURCE_FILE} NAME_WE)
++    GET_FILENAME_COMPONENT(_basepath ${SOURCE_FILE} PATH)
++
++    if(WIN32)
++      string(REGEX REPLACE ".:/" "/" _basepath "${_basepath}")
++    endif(WIN32)
++
++    SET(_bin_py ${CMAKE_CURRENT_BINARY_DIR}/${_basepath}/${_filename})
++    SET(_bin_pyc 
${CMAKE_CURRENT_BINARY_DIR}/${_basepath}/${_filenamebase}.pyc)
++
++    FILE(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/${_basepath})
++
++    SET(_message "-DMESSAGE=Byte-compiling ${_bin_py}")
++
++    GET_FILENAME_COMPONENT(_abs_bin_py ${_bin_py} ABSOLUTE)
++    IF(_abs_bin_py STREQUAL ${_absfilename})    # Don't copy the file onto 
itself.
++      ADD_CUSTOM_COMMAND(
++        TARGET compile_python_files
++        COMMAND ${CMAKE_COMMAND} -E echo ${message}
++        COMMAND ${PYTHON_EXECUTABLE} ${_python_compile_py} ${_bin_py}
++        DEPENDS ${_absfilename}
++      )
++    ELSE(_abs_bin_py STREQUAL ${_absfilename})
++      ADD_CUSTOM_COMMAND(
++        TARGET compile_python_files
++        COMMAND ${CMAKE_COMMAND} -E echo ${message}
++        COMMAND ${CMAKE_COMMAND} -E copy ${_absfilename} ${_bin_py}
++        COMMAND ${PYTHON_EXECUTABLE} ${_python_compile_py} ${_bin_py}
++        DEPENDS ${_absfilename}
++      )
++    ENDIF(_abs_bin_py STREQUAL ${_absfilename})
+ 
+-  INSTALL(FILES ${_bin_pyc} DESTINATION ${DESINATION_DIR})
++    INSTALL(FILES ${_bin_pyc} DESTINATION ${DESINATION_DIR})
++  ENDIF("$ENV{PYTHONDONTWRITEBYTECODE}" STREQUAL "")
+ ENDMACRO(PYTHON_INSTALL)

Copied: kdelibs/repos/staging-x86_64/PKGBUILD (from rev 159699, 
kdelibs/trunk/PKGBUILD)
===================================================================
--- staging-x86_64/PKGBUILD                             (rev 0)
+++ staging-x86_64/PKGBUILD     2012-05-26 07:41:12 UTC (rev 159700)
@@ -0,0 +1,61 @@
+# $Id$
+# Maintainer: Andrea Scarpino <and...@archlinux.org
+# Contributor: Pierre Schmitz <pie...@archlinux.de>
+
+pkgname=kdelibs
+pkgver=4.8.3
+pkgrel=2
+pkgdesc="KDE Core Libraries"
+arch=('i686' 'x86_64')
+url='http://www.kde.org'
+license=('GPL' 'LGPL' 'FDL')
+depends=('strigi' 'attica' 'libxss' 'soprano' 'krb5' 'grantlee'
+        'shared-desktop-ontologies' 'qca' 'libdbusmenu-qt' 'polkit-qt'
+        'shared-mime-info' 'enchant' 'giflib' 'jasper' 'openexr'
+        'docbook-xsl' 'upower' 'udisks' 'libxcursor' 'phonon' 'qtwebkit'
+        'media-player-info' 'herqq')
+makedepends=('cmake' 'automoc4' 'avahi' 'libgl' 'hspell')
+install=${pkgname}.install
+source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz";
+        'kde-applications-menu.patch' 'archlinux-menu.patch'
+        'use-pythondontwritebytecode.patch')
+sha1sums=('50633efa4ea2a133e51bf55286ff754c46f2eae2'
+          '86ee8c8660f19de8141ac99cd6943964d97a1ed7'
+          '63a850ab4196b9d06934f2b4a13acd9f7739bc67'
+          'a1e35760d5b4e29471ad357c963a343c67200f32')
+
+build() {
+       cd "${srcdir}"/${pkgname}-${pkgver}
+
+       # avoid file conflict with gnome-menus
+       patch -p1 -i "${srcdir}"/kde-applications-menu.patch
+       # add Archlinux menu entry
+       patch -p1 -i "${srcdir}"/archlinux-menu.patch
+
+       # Set PYTHONDONTWRITEBYTECODE (KDEBUG#276151)
+       patch -p0 -i "${srcdir}"/use-pythondontwritebytecode.patch
+
+       cd "${srcdir}"
+       mkdir build
+       cd build
+       cmake ../${pkgname}-${pkgver} \
+               -DCMAKE_BUILD_TYPE=Release \
+               -DCMAKE_SKIP_RPATH=ON \
+               -DKDE_DISTRIBUTION_TEXT='Arch Linux' \
+               -DCMAKE_INSTALL_PREFIX=/usr \
+               -DSYSCONF_INSTALL_DIR=/etc \
+               -DHTML_INSTALL_DIR=/usr/share/doc/kde/html \
+               -DKDE_DEFAULT_HOME='.kde4' \
+               -DWITH_FAM=OFF
+       make
+}
+
+package() {
+       cd "${srcdir}"/build
+       make DESTDIR="${pkgdir}" install
+
+       # cert bundle seems to be hardcoded
+       # link it to the one from ca-certificates
+       rm -f "${pkgdir}"/usr/share/apps/kssl/ca-bundle.crt
+       ln -sf /etc/ssl/certs/ca-certificates.crt 
"${pkgdir}"/usr/share/apps/kssl/ca-bundle.crt
+}

Copied: kdelibs/repos/staging-x86_64/archlinux-menu.patch (from rev 159699, 
kdelibs/trunk/archlinux-menu.patch)
===================================================================
--- staging-x86_64/archlinux-menu.patch                         (rev 0)
+++ staging-x86_64/archlinux-menu.patch 2012-05-26 07:41:12 UTC (rev 159700)
@@ -0,0 +1,22 @@
+--- kdelibs-4.3.98/kded/applications.menu      2010-01-31 19:28:11.000000000 
+0000
++++ kdelibs-4.3.98/kded/applications.menu      2010-01-31 22:25:53.556043077 
+0000
+@@ -16,11 +16,19 @@
+       </DefaultLayout>
+       <Layout>
+               <Merge type="menus"/>
++              <Menuname>Arch Linux</Menuname>
+               <Menuname>Applications</Menuname>
+               <Merge type="files"/>
+       </Layout>
+ 
+       <Menu>
++              <Name>Arch Linux</Name>                                         
                                                          
++              <Directory>Archlinux.directory</Directory>                      
                                                         
++              <Include>                                                       
                                                         
++                      <Category>Archlinux</Category>                          
                                                                 
++              </Include>
++      </Menu>
++      <Menu>
+               <Name>Applications</Name>
+               <Directory>kde-unknown.directory</Directory>
+               <OnlyUnallocated/>

Copied: kdelibs/repos/staging-x86_64/kde-applications-menu.patch (from rev 
159699, kdelibs/trunk/kde-applications-menu.patch)
===================================================================
--- staging-x86_64/kde-applications-menu.patch                          (rev 0)
+++ staging-x86_64/kde-applications-menu.patch  2012-05-26 07:41:12 UTC (rev 
159700)
@@ -0,0 +1,22 @@
+--- kdelibs-4.3.98/kded/CMakeLists.txt 2009-10-02 14:55:17.000000000 +0000
++++ kdelibs-4.3.98/kded/CMakeLists.txt 2010-01-31 22:16:13.946933892 +0000
+@@ -69,7 +69,7 @@
+ if (WIN32)
+ install( FILES applications.menu  DESTINATION  
${SHARE_INSTALL_PREFIX}/xdg/menus )
+ else (WIN32)
+-install( FILES applications.menu  DESTINATION  
${SYSCONF_INSTALL_DIR}/xdg/menus )
++install( FILES applications.menu  DESTINATION  
${SYSCONF_INSTALL_DIR}/xdg/menus RENAME kde-applications.menu )
+ endif (WIN32)
+ install( FILES kdedmodule.desktop DESTINATION  ${SERVICETYPES_INSTALL_DIR} )
+ install( FILES kded.upd           DESTINATION  
${DATA_INSTALL_DIR}/kconf_update )
+--- kdelibs-4.3.98/kded/kbuildsycoca.cpp       2009-12-04 23:10:18.000000000 
+0000
++++ kdelibs-4.3.98/kded/kbuildsycoca.cpp       2010-01-31 22:16:13.962766572 
+0000
+@@ -302,7 +302,7 @@
+      if (!m_trackId.isEmpty())
+         g_vfolder->setTrackId(m_trackId);
+ 
+-     VFolderMenu::SubMenu *kdeMenu = 
g_vfolder->parseMenu("applications.menu", true);
++     VFolderMenu::SubMenu *kdeMenu = 
g_vfolder->parseMenu("kde-applications.menu", true);
+ 
+      KServiceGroup::Ptr entry = g_bsgf->addNew("/", kdeMenu->directoryFile, 
KServiceGroup::Ptr(), false);
+      entry->setLayoutInfo(kdeMenu->layoutList);

Copied: kdelibs/repos/staging-x86_64/kdelibs.install (from rev 159699, 
kdelibs/trunk/kdelibs.install)
===================================================================
--- staging-x86_64/kdelibs.install                              (rev 0)
+++ staging-x86_64/kdelibs.install      2012-05-26 07:41:12 UTC (rev 159700)
@@ -0,0 +1,13 @@
+post_install() {
+       xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+       update-mime-database usr/share/mime &> /dev/null
+    update-desktop-database -q
+}
+
+post_upgrade() {
+       post_install
+}
+
+post_remove() {
+       post_install
+}

Copied: kdelibs/repos/staging-x86_64/use-pythondontwritebytecode.patch (from 
rev 159699, kdelibs/trunk/use-pythondontwritebytecode.patch)
===================================================================
--- staging-x86_64/use-pythondontwritebytecode.patch                            
(rev 0)
+++ staging-x86_64/use-pythondontwritebytecode.patch    2012-05-26 07:41:12 UTC 
(rev 159700)
@@ -0,0 +1,80 @@
+--- cmake/modules/PythonMacros.cmake
++++ cmake/modules/PythonMacros.cmake
+@@ -23,40 +23,42 @@
+   # Install the source file.
+   INSTALL(FILES ${SOURCE_FILE} DESTINATION ${DESINATION_DIR})
+ 
+-  # Byte compile and install the .pyc file.        
+-  GET_FILENAME_COMPONENT(_absfilename ${SOURCE_FILE} ABSOLUTE)
+-  GET_FILENAME_COMPONENT(_filename ${SOURCE_FILE} NAME)
+-  GET_FILENAME_COMPONENT(_filenamebase ${SOURCE_FILE} NAME_WE)
+-  GET_FILENAME_COMPONENT(_basepath ${SOURCE_FILE} PATH)
+-
+-  if(WIN32)
+-    string(REGEX REPLACE ".:/" "/" _basepath "${_basepath}")
+-  endif(WIN32)
+-
+-  SET(_bin_py ${CMAKE_CURRENT_BINARY_DIR}/${_basepath}/${_filename})
+-  SET(_bin_pyc ${CMAKE_CURRENT_BINARY_DIR}/${_basepath}/${_filenamebase}.pyc)
+-
+-  FILE(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/${_basepath})
+-
+-  SET(_message "-DMESSAGE=Byte-compiling ${_bin_py}")
+-
+-  GET_FILENAME_COMPONENT(_abs_bin_py ${_bin_py} ABSOLUTE)
+-  IF(_abs_bin_py STREQUAL ${_absfilename})    # Don't copy the file onto 
itself.
+-    ADD_CUSTOM_COMMAND(
+-      TARGET compile_python_files
+-      COMMAND ${CMAKE_COMMAND} -E echo ${message}
+-      COMMAND ${PYTHON_EXECUTABLE} ${_python_compile_py} ${_bin_py}
+-      DEPENDS ${_absfilename}
+-    )
+-  ELSE(_abs_bin_py STREQUAL ${_absfilename})
+-    ADD_CUSTOM_COMMAND(
+-      TARGET compile_python_files
+-      COMMAND ${CMAKE_COMMAND} -E echo ${message} 
+-      COMMAND ${CMAKE_COMMAND} -E copy ${_absfilename} ${_bin_py}
+-      COMMAND ${PYTHON_EXECUTABLE} ${_python_compile_py} ${_bin_py}
+-      DEPENDS ${_absfilename}
+-    )
+-  ENDIF(_abs_bin_py STREQUAL ${_absfilename})
++  # Byte compile and install the .pyc file.
++  IF("$ENV{PYTHONDONTWRITEBYTECODE}" STREQUAL "")
++    GET_FILENAME_COMPONENT(_absfilename ${SOURCE_FILE} ABSOLUTE)
++    GET_FILENAME_COMPONENT(_filename ${SOURCE_FILE} NAME)
++    GET_FILENAME_COMPONENT(_filenamebase ${SOURCE_FILE} NAME_WE)
++    GET_FILENAME_COMPONENT(_basepath ${SOURCE_FILE} PATH)
++
++    if(WIN32)
++      string(REGEX REPLACE ".:/" "/" _basepath "${_basepath}")
++    endif(WIN32)
++
++    SET(_bin_py ${CMAKE_CURRENT_BINARY_DIR}/${_basepath}/${_filename})
++    SET(_bin_pyc 
${CMAKE_CURRENT_BINARY_DIR}/${_basepath}/${_filenamebase}.pyc)
++
++    FILE(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/${_basepath})
++
++    SET(_message "-DMESSAGE=Byte-compiling ${_bin_py}")
++
++    GET_FILENAME_COMPONENT(_abs_bin_py ${_bin_py} ABSOLUTE)
++    IF(_abs_bin_py STREQUAL ${_absfilename})    # Don't copy the file onto 
itself.
++      ADD_CUSTOM_COMMAND(
++        TARGET compile_python_files
++        COMMAND ${CMAKE_COMMAND} -E echo ${message}
++        COMMAND ${PYTHON_EXECUTABLE} ${_python_compile_py} ${_bin_py}
++        DEPENDS ${_absfilename}
++      )
++    ELSE(_abs_bin_py STREQUAL ${_absfilename})
++      ADD_CUSTOM_COMMAND(
++        TARGET compile_python_files
++        COMMAND ${CMAKE_COMMAND} -E echo ${message}
++        COMMAND ${CMAKE_COMMAND} -E copy ${_absfilename} ${_bin_py}
++        COMMAND ${PYTHON_EXECUTABLE} ${_python_compile_py} ${_bin_py}
++        DEPENDS ${_absfilename}
++      )
++    ENDIF(_abs_bin_py STREQUAL ${_absfilename})
+ 
+-  INSTALL(FILES ${_bin_pyc} DESTINATION ${DESINATION_DIR})
++    INSTALL(FILES ${_bin_pyc} DESTINATION ${DESINATION_DIR})
++  ENDIF("$ENV{PYTHONDONTWRITEBYTECODE}" STREQUAL "")
+ ENDMACRO(PYTHON_INSTALL)

Reply via email to