diff --git a/scripts/customwidget.cpp.template b/scripts/customwidget.cpp.template index a9674082831..ec232009959 100644 --- a/scripts/customwidget.cpp.template +++ b/scripts/customwidget.cpp.template @@ -61,7 +61,7 @@ bool %CLASSMIXEDCASE%Plugin::isInitialized() const void %CLASSMIXEDCASE%Plugin::initialize( QDesignerFormEditorInterface *core ) { - Q_UNUSED( core ); + Q_UNUSED( core ) if ( mInitialized ) return; mInitialized = true; diff --git a/scripts/customwidget.h.template b/scripts/customwidget.h.template index 75becbaedae..9b33b557d12 100644 --- a/scripts/customwidget.h.template +++ b/scripts/customwidget.h.template @@ -20,6 +20,7 @@ #include #include #include +#include "qgis_customwidgets.h" class CUSTOMWIDGETS_EXPORT %CLASSMIXEDCASE%Plugin : public QObject, public QDesignerCustomWidgetInterface diff --git a/scripts/customwidget_create.sh b/scripts/customwidget_create.sh index 282af0641ef..d221ebd7a2c 100755 --- a/scripts/customwidget_create.sh +++ b/scripts/customwidget_create.sh @@ -9,6 +9,12 @@ set -e +# GNU prefix command for mac os support (gsed, gsplit) +GP= +if [[ "$OSTYPE" =~ darwin* ]]; then + GP=g +fi + CLASSNAME=$1 TODAY=$(date '+%d.%m.%Y') @@ -27,13 +33,11 @@ for i in "${EXT[@]}" do DESTFILE=$DIR/../src/customwidgets/${CLASSLOWER}plugin.$i cp "$DIR"/customwidget."$i".template "$DESTFILE" - sed -i s/%DATE%/"$TODAY"/g "$DESTFILE" - sed -i s/%YEAR%/"$YEAR"/g "$DESTFILE" - sed -i s/%AUTHOR%/"$AUTHOR"/g "$DESTFILE" - sed -i s/%EMAIL%/"$EMAIL"/g "$DESTFILE" - sed -i s/%CLASSUPPERCASE%/"$CLASSUPPER"/g "$DESTFILE" - sed -i s/%CLASSLOWERCASE%/"$CLASSLOWER"/g "$DESTFILE" - sed -i s/%CLASSMIXEDCASE%/"$CLASSNAME"/g "$DESTFILE" + ${GP}sed -i s/%DATE%/"$TODAY"/g "$DESTFILE" + ${GP}sed -i s/%YEAR%/"$YEAR"/g "$DESTFILE" + ${GP}sed -i s/%AUTHOR%/"$AUTHOR"/g "$DESTFILE" + ${GP}sed -i s/%EMAIL%/"$EMAIL"/g "$DESTFILE" + ${GP}sed -i s/%CLASSUPPERCASE%/"$CLASSUPPER"/g "$DESTFILE" + ${GP}sed -i s/%CLASSLOWERCASE%/"$CLASSLOWER"/g "$DESTFILE" + ${GP}sed -i s/%CLASSMIXEDCASE%/"$CLASSNAME"/g "$DESTFILE" done - -