Skip to content
Permalink
Browse files

remove tons of pyuic4, pyrcc4 generated files and create them when bu…

…ilding (apply #1877)

git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@11401 c8812cc2-4d05-0410-92ff-de0c093fc19c
  • Loading branch information
jef
jef committed Aug 16, 2009
1 parent 5162df6 commit 1d51497500eb0d5ca57d98c78f839b4e20d3030e
Showing with 134 additions and 14,618 deletions.
  1. +49 −0 cmake/Python.cmake
  2. +10 −13 python/plugins/fTools/CMakeLists.txt
  3. +2 −2 python/plugins/fTools/doAbout.py
  4. +1 −2 python/plugins/fTools/fTools.py
  5. +0 −92 python/plugins/fTools/frmAbout.py
  6. +1 −48 python/plugins/fTools/icons/gis/CMakeLists.txt
  7. BIN python/plugins/fTools/icons/gis/nodes.png
  8. +0 −8,504 python/plugins/fTools/resources.py
  9. +9 −60 python/plugins/fTools/tools/CMakeLists.txt
  10. +1 −1 python/plugins/fTools/tools/doDefineProj.py
  11. +1 −1 python/plugins/fTools/tools/doGeometry.py
  12. +1 −1 python/plugins/fTools/tools/doGeoprocessing.py
  13. +1 −1 python/plugins/fTools/tools/doIntersectLines.py
  14. +1 −1 python/plugins/fTools/tools/doJoinAttributes.py
  15. +1 −1 python/plugins/fTools/tools/doMeanCoords.py
  16. +1 −1 python/plugins/fTools/tools/doPointDistance.py
  17. +1 −1 python/plugins/fTools/tools/doPointsInPolygon.py
  18. +1 −1 python/plugins/fTools/tools/doRandPoints.py
  19. +1 −1 python/plugins/fTools/tools/doRandom.py
  20. +1 −1 python/plugins/fTools/tools/doReProject.py
  21. +1 −1 python/plugins/fTools/tools/doRegPoints.py
  22. +3 −3 python/plugins/fTools/tools/doSelectByLocation.py
  23. +1 −1 python/plugins/fTools/tools/doSpatialJoin.py
  24. +1 −1 python/plugins/fTools/tools/doSubsetSelect.py
  25. +1 −1 python/plugins/fTools/tools/doSumLines.py
  26. +1 −1 python/plugins/fTools/tools/doVectorGrid.py
  27. +1 −1 python/plugins/fTools/tools/doVectorSplit.py
  28. +1 −1 python/plugins/fTools/tools/doVisual.py
  29. +0 −116 python/plugins/fTools/tools/frmGeometry.py
  30. +0 −164 python/plugins/fTools/tools/frmGeoprocessing.py
  31. +0 −120 python/plugins/fTools/tools/frmIntersectLines.py
  32. +0 −175 python/plugins/fTools/tools/frmJoinAttributes.py
  33. +0 −120 python/plugins/fTools/tools/frmMeanCoords.py
  34. +0 −159 python/plugins/fTools/tools/frmPointDistance.py
  35. +0 −109 python/plugins/fTools/tools/frmPointsInPolygon.py
  36. +0 −197 python/plugins/fTools/tools/frmRandPoints.py
  37. +0 −97 python/plugins/fTools/tools/frmRandom.py
  38. +0 −135 python/plugins/fTools/tools/frmReProject.py
  39. +0 −199 python/plugins/fTools/tools/frmRegPoints.py
  40. +0 −167 python/plugins/fTools/tools/frmSpatialJoin.py
  41. +0 −122 python/plugins/fTools/tools/frmSubsetSelect.py
  42. +0 −109 python/plugins/fTools/tools/frmSumLines.py
  43. +0 −215 python/plugins/fTools/tools/frmVectorGrid.py
  44. +0 −82 python/plugins/fTools/tools/frmVectorSplit.py
  45. +0 −93 python/plugins/fTools/tools/frmVisual.py
  46. +6 −4 python/plugins/mapserver_export/CMakeLists.txt
  47. +1 −1 python/plugins/mapserver_export/mapserverexport.py
  48. +1 −1 python/plugins/mapserver_export/mapserverexportdialog.py
  49. +0 −283 python/plugins/mapserver_export/resources.py
  50. +0 −253 python/plugins/mapserver_export/ui_mapserverexport.py
  51. +3 −20 python/plugins/osm/CMakeLists.txt
  52. +1 −1 python/plugins/osm/OsmAddRelationDlg.py
  53. +1 −1 python/plugins/osm/OsmDownloadDlg.py
  54. +1 −1 python/plugins/osm/OsmFeatureDW.py
  55. +1 −1 python/plugins/osm/OsmImportDlg.py
  56. +1 −1 python/plugins/osm/OsmLoadDlg.py
  57. +1 −1 python/plugins/osm/OsmPlugin.py
  58. +1 −1 python/plugins/osm/OsmSaveDlg.py
  59. +1 −1 python/plugins/osm/OsmUndoRedoDW.py
  60. +1 −1 python/plugins/osm/OsmUploadDlg.py
  61. +0 −1,685 python/plugins/osm/resources.py
  62. +15 −14 python/plugins/plugin_installer/CMakeLists.txt
  63. +5 −5 python/plugins/plugin_installer/installer_gui.py
  64. +1 −1 python/plugins/plugin_installer/installer_plugin.py
  65. +0 −293 python/plugins/plugin_installer/qgsplugininstallerbase.py
  66. +0 −85 python/plugins/plugin_installer/qgsplugininstallerfetchingbase.py
  67. +0 −73 python/plugins/plugin_installer/qgsplugininstallerinstallingbase.py
  68. +0 −68 python/plugins/plugin_installer/qgsplugininstallerpluginerrorbase.py
  69. +0 −122 python/plugins/plugin_installer/qgsplugininstallerrepositorybase.py
  70. +0 −580 python/plugins/plugin_installer/resources_rc.py
@@ -7,6 +7,55 @@
FIND_PACKAGE(PythonLibs) # MapServer export tool
FIND_PACKAGE(PythonInterp) # test for sip and PyQt4

FIND_PROGRAM(PYUIC4_PROGRAM pyuic4)

IF(${PYUIC4_PROGRAM} STREQUAL "PYUIC4_PROGRAM-NOTFOUND")
MESSAGE(ERROR "pyuic4 is required")
ENDIF(${PYUIC4_PROGRAM} STREQUAL "PYUIC4_PROGRAM-NOTFOUND")

# Adapted from QT4_WRAP_UI
MACRO(PYQT4_WRAP_UI outfiles )
FOREACH(it ${ARGN})
GET_FILENAME_COMPONENT(outfile ${it} NAME_WE)
GET_FILENAME_COMPONENT(infile ${it} ABSOLUTE)
SET(outfile ${CMAKE_CURRENT_BINARY_DIR}/ui_${outfile}.py)
ADD_CUSTOM_COMMAND(OUTPUT ${outfile}
COMMAND ${PYUIC4_PROGRAM} ${infile} -o ${outfile}
MAIN_DEPENDENCY ${infile}
)
SET(${outfiles} ${${outfiles}} ${outfile})
ENDFOREACH(it)
ENDMACRO(PYQT4_WRAP_UI)

FIND_PROGRAM(PYRCC4_PROGRAM pyrcc4)

# Adapted from QT4_ADD_RESOURCES
MACRO (PYQT4_ADD_RESOURCES outfiles )
FOREACH (it ${ARGN})
GET_FILENAME_COMPONENT(outfile ${it} NAME_WE)
GET_FILENAME_COMPONENT(infile ${it} ABSOLUTE)
GET_FILENAME_COMPONENT(rc_path ${infile} PATH)
SET(outfile ${CMAKE_CURRENT_BINARY_DIR}/${outfile}_rc.py)
# parse file for dependencies
# all files are absolute paths or relative to the location of the qrc file
FILE(READ "${infile}" _RC_FILE_CONTENTS)
STRING(REGEX MATCHALL "<file[^<]+" _RC_FILES "${_RC_FILE_CONTENTS}")
SET(_RC_DEPENDS)
FOREACH(_RC_FILE ${_RC_FILES})
STRING(REGEX REPLACE "^<file[^>]*>" "" _RC_FILE "${_RC_FILE}")
STRING(REGEX MATCH "^/|([A-Za-z]:/)" _ABS_PATH_INDICATOR "${_RC_FILE}")
IF(NOT _ABS_PATH_INDICATOR)
SET(_RC_FILE "${rc_path}/${_RC_FILE}")
ENDIF(NOT _ABS_PATH_INDICATOR)
SET(_RC_DEPENDS ${_RC_DEPENDS} "${_RC_FILE}")
ENDFOREACH(_RC_FILE)
ADD_CUSTOM_COMMAND(OUTPUT ${outfile}
COMMAND ${PYRCC4_PROGRAM} -name ${outfile} -o ${outfile} ${infile}
MAIN_DEPENDENCY ${infile}
DEPENDS ${_RC_DEPENDS})
SET(${outfiles} ${${outfiles}} ${outfile})
ENDFOREACH (it)
ENDMACRO (PYQT4_ADD_RESOURCES)

MACRO (TRY_RUN_PYTHON RESULT CMD)
IF (PYTHONINTERP_FOUND)
@@ -1,16 +1,13 @@
#TODO: Need to configure cmake to run pyrcc4 and pyuic4 as required when the resource
# file or the ui change
SET(INSTALLER_FILES
__init__.py
frmAbout.py
ftools_help.xsl
resources.qrc
frmAbout.ui
fTools.py
doAbout.py
ftools_help.xml
resources.py
)
FILE(GLOB INSTALLER_FILES *.py)
SET(INSTALLER_FILES ${INSTALLER_FILES} ftools_help.xsl ftools_help.xml)

FILE(GLOB UI_FILES *.ui)
PYQT4_WRAP_UI(PYUI_FILES ${UI_FILES})
PYQT4_ADD_RESOURCES(PYRC_FILES resources.qrc)
ADD_CUSTOM_TARGET(ftools ALL DEPENDS ${PYUI_FILES} ${PYRC_FILES})

SET(INSTALLER_FILES ${INSTALLER_FILES} ${PYUI_FILES} ${PYRC_FILES})

INSTALL(FILES ${INSTALLER_FILES} DESTINATION ${QGIS_DATA_DIR}/python/plugins/fTools)

SUBDIRS(tools icons)
@@ -19,8 +19,8 @@

from qgis.core import *
import webbrowser, os
from frmAbout import Ui_Dialog
import resources
from ui_frmAbout import Ui_Dialog
import resources_rc
currentPath = os.path.dirname(__file__)

class Dialog(QDialog, Ui_Dialog):
@@ -32,9 +32,8 @@

from PyQt4.QtCore import *
from PyQt4.QtGui import *
import resources
from qgis.core import *
import resources
import resources_rc
import os.path, sys
# Set up current path, so that we know where to look for mudules
currentPath = os.path.dirname( __file__ )

This file was deleted.

@@ -1,49 +1,2 @@
#TODO: Need to configure cmake to run pyrcc4 and pyuic4 as required when the resource
# file or the ui change
SET(ICON_FILES
analysis.png
geometry.png
sampling.png
basic_statistics.png
geoprocessing.png
select_location.png
buffer.png
help.png
simplify.png
centroids.png
intersections.png
single_to_multi.png
check_geometry.png
intersect.png
split_layer.png
clip.png
join_attributes.png
sub_selection.png
convex_hull.png
join_location.png
sum_lines.png
define_projection.png
management.png
sum_points.png
difference.png
matrix.png
sym_difference.png
dissolve.png
mean.png
to_lines.png
export_geometry.png
multi_to_single.png
union.png
export_projection.png
neighbour.png
unique.png
extract_nodes.png
random_points.png
vector_grid.png
random_selection.png
ftools_logo.png
regular_points.png
delaunay.png
layer_extent.png
)
FILE(GLOB ICON_FILES *.png)
INSTALL(FILES ${ICON_FILES} DESTINATION ${QGIS_DATA_DIR}/python/plugins/fTools/icons/gis)
Binary file not shown.

0 comments on commit 1d51497

Please sign in to comment.
You can’t perform that action at this time.