Skip to content

Commit

Permalink
fixing for QGIS 2.0
Browse files Browse the repository at this point in the history
  • Loading branch information
rduivenvoorde committed Oct 24, 2013
1 parent f8d30f5 commit 2f8e964
Show file tree
Hide file tree
Showing 6 changed files with 3,444 additions and 41 deletions.
26 changes: 13 additions & 13 deletions Makefile
Expand Up @@ -33,7 +33,7 @@ PLUGINNAME = pdokservicesplugin

PY_FILES = pdokservicesplugin.py pdokservicesplugindialog.py __init__.py

EXTRAS = icon.png help.png pdok.json
EXTRAS = icon.png help.png pdok.json metadata.txt

UI_FILES = ui_pdokservicesplugin.py

Expand All @@ -56,31 +56,31 @@ compile: $(UI_FILES) $(RESOURCE_FILES)

# The deploy target only works on unix like operating system where
# the Python plugin directory is located at:
# $HOME/.qgis/python/plugins
# $HOME/.qgis2/python/plugins
deploy: compile doc transcompile
mkdir -p $(HOME)/.qgis/python/plugins/$(PLUGINNAME)
cp -vf $(PY_FILES) $(HOME)/.qgis/python/plugins/$(PLUGINNAME)
cp -vf $(UI_FILES) $(HOME)/.qgis/python/plugins/$(PLUGINNAME)
cp -vf $(RESOURCE_FILES) $(HOME)/.qgis/python/plugins/$(PLUGINNAME)
cp -vf $(EXTRAS) $(HOME)/.qgis/python/plugins/$(PLUGINNAME)
cp -vfr i18n $(HOME)/.qgis/python/plugins/$(PLUGINNAME)
cp -vfr $(HELP) $(HOME)/.qgis/python/plugins/$(PLUGINNAME)/help
mkdir -p $(HOME)/.qgis2/python/plugins/$(PLUGINNAME)
cp -vf $(PY_FILES) $(HOME)/.qgis2/python/plugins/$(PLUGINNAME)
cp -vf $(UI_FILES) $(HOME)/.qgis2/python/plugins/$(PLUGINNAME)
cp -vf $(RESOURCE_FILES) $(HOME)/.qgis2/python/plugins/$(PLUGINNAME)
cp -vf $(EXTRAS) $(HOME)/.qgis2/python/plugins/$(PLUGINNAME)
cp -vfr i18n $(HOME)/.qgis2/python/plugins/$(PLUGINNAME)
cp -vfr $(HELP) $(HOME)/.qgis2/python/plugins/$(PLUGINNAME)/help

# The dclean target removes compiled python files from plugin directory
# also delets any .svn entry
dclean:
find $(HOME)/.qgis/python/plugins/$(PLUGINNAME) -iname "*.pyc" -delete
find $(HOME)/.qgis/python/plugins/$(PLUGINNAME) -iname ".svn" -prune -exec rm -Rf {} \;
find $(HOME)/.qgis2/python/plugins/$(PLUGINNAME) -iname "*.pyc" -delete
find $(HOME)/.qgis2/python/plugins/$(PLUGINNAME) -iname ".svn" -prune -exec rm -Rf {} \;

# The derase deletes deployed plugin
derase:
rm -Rf $(HOME)/.qgis/python/plugins/$(PLUGINNAME)
rm -Rf $(HOME)/.qgis2/python/plugins/$(PLUGINNAME)

# The zip target deploys the plugin and creates a zip file with the deployed
# content. You can then upload the zip file on http://plugins.qgis.org
zip: deploy dclean
rm -f $(PLUGINNAME).zip
cd $(HOME)/.qgis/python/plugins; zip -9r $(CURDIR)/$(PLUGINNAME).zip $(PLUGINNAME)
cd $(HOME)/.qgis2/python/plugins; zip -9r $(CURDIR)/$(PLUGINNAME).zip $(PLUGINNAME)

# Create a zip package of the plugin named $(PLUGINNAME).zip.
# This requires use of git (your plugin development directory must be a
Expand Down
4 changes: 2 additions & 2 deletions __init__.py
Expand Up @@ -25,11 +25,11 @@ def name():
def description():
return "Plugin to easily load the available dutch PDOK (Publieke Data Op de Kaart) services."
def version():
return "Version 0.3"
return "Version 0.4"
def icon():
return "icon.png"
def qgisMinimumVersion():
return "1.8"
return "1.5"
def author():
return "Richard Duivenvoorde"
def email():
Expand Down
9 changes: 6 additions & 3 deletions metadata.txt
Expand Up @@ -10,11 +10,12 @@

[general]
name=PDOK services plugin
qgisMinimumVersion=1.8
qgisMinimumVersion=1.5
qgisMaximumVersion=2.99
description=Plugin to easily load the available dutch PDOK (Publieke Data Op de Kaart) services.
version=0.3
version=0.5
author=Richard Duivenvoorde
email=richard@duif.net
email=richard@webmapper.net

# end of mandatory metadata

Expand All @@ -23,6 +24,8 @@ email=richard@duif.net
# Uncomment the following line and add your changelog entries:

changelog:
0.5 (10-2013) fix for QGIS 2.0 api
0.4 (11-2012) updated for new pdok services
0.3 (10-2012) initial version

# tags are comma separated with spaces allowed
Expand Down

0 comments on commit 2f8e964

Please sign in to comment.