diff options
| author | Lionel Elie Mamane <lionel@mamane.lu> | 2011-08-12 11:44:07 +0200 |
|---|---|---|
| committer | Lionel Elie Mamane <lionel@mamane.lu> | 2011-11-17 21:15:23 +0100 |
| commit | 391193b62233866e0e6789c7606b5d8a87cebc3a (patch) | |
| tree | f50817f636ae7645810237978f8344541cccf17e | |
| parent | fc03666c16e3b6d67f5e4c61c696179034c1b4bf (diff) | |
pgsql-sdbc: ++version, auto-fill version in description.xml, long description
4 files changed, 19 insertions, 8 deletions
diff --git a/connectivity/source/drivers/postgresql/description.xml b/connectivity/source/drivers/postgresql/description.xml index d282e16c2ef3..5662acbd3ae3 100644 --- a/connectivity/source/drivers/postgresql/description.xml +++ b/connectivity/source/drivers/postgresql/description.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <description xmlns="http://openoffice.org/extensions/description/2006" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:dep="http://openoffice.org/extensions/description/2006"> - <version value="0.8.0" /> + <version value="@EXTENSION_VERSION@" /> <identifier value="postgresql-sdbc" /> <display-name> <name lang="en-US">PostgreSQL-SDBC Driver</name> @@ -11,4 +11,7 @@ <publisher> <name xlink:href="http://www.mamane.lu/" lang="en">Lionel Elie Mamane</name> </publisher> + <extension-description> + <src lang="en-US" xlink:href="description/description_en-US.txt"/> + </extension-description> </description> diff --git a/connectivity/source/drivers/postgresql/description/description_en-US.txt b/connectivity/source/drivers/postgresql/description/description_en-US.txt new file mode 100644 index 000000000000..c7af1add55d3 --- /dev/null +++ b/connectivity/source/drivers/postgresql/description/description_en-US.txt @@ -0,0 +1 @@ +A native PostgreSQL database driver for LibreOffice. It is faster, seamlessly integrated and there is no need to install and setup a JDBC or ODBC driver separately. diff --git a/connectivity/source/drivers/postgresql/makefile.mk b/connectivity/source/drivers/postgresql/makefile.mk index 5b108a3fc0df..23092afec2fe 100644 --- a/connectivity/source/drivers/postgresql/makefile.mk +++ b/connectivity/source/drivers/postgresql/makefile.mk @@ -80,8 +80,9 @@ NO_DEFAULT_STL=TRUE DLLPRE= PQ_SDBC_MAJOR=0 -PQ_SDBC_MINOR=7 -PQ_SDBC_MICRO=7 +PQ_SDBC_MINOR=8 +PQ_SDBC_MICRO=0 +PQ_SDBC_VERSION=$(PQ_SDBC_MAJOR).$(PQ_SDBC_MINOR).$(PQ_SDBC_MICRO) .IF "$(SYSTEM_POSTGRESQL)" == "YES" POSTGRESQL_MAJOR=`pg_config --version | awk '{ print $$2 }' | cut -d. -f1` POSTGRESQL_MINOR=`pg_config --version | awk '{ print $$2 }' | cut -d. -f2` @@ -176,7 +177,7 @@ SHL2VERSIONMAP=$(SOLARENV)$/src$/reg-component.map SLOFILES= $(LIB1OBJFILES) $(LIB2OBJFILES) -DRIVERNAME=postgresql-sdbc-$(PQ_SDBC_MAJOR).$(PQ_SDBC_MINOR).$(PQ_SDBC_MICRO).oxt +DRIVERNAME=postgresql-sdbc-$(PQ_SDBC_VERSION).oxt ALLTAR : $(DLLDEST)$/$(DRIVERNAME) # --- Targets ------------------------------------------------------ @@ -194,6 +195,7 @@ $(DLLDEST)$/$(SHL1TARGET)$(INI_EXT): $(SHL1TARGET) $(DLLDEST)$/$(DRIVERNAME): \ $(DLLDEST)$/META-INF$/manifest.xml \ $(DLLDEST)$/description.xml \ + $(DLLDEST)$/description/description_en-US.txt \ $(DLLDEST)$/postgresql.xcu \ $(DLLDEST)$/$(SHL1TARGET)$(DLLPOST) \ $(DLLDEST)$/$(SHL2TARGET)$(DLLPOST) \ @@ -205,17 +207,22 @@ $(DLLDEST)$/$(DRIVERNAME): \ $(SHL2TARGET)$(DLLPOST) \ $(SHL1TARGET)$(INI_EXT) \ description.xml \ + description/description_en-US.txt \ postgresql.xcu +$(DLLDEST)$/description/% : description/% + mkdir -p $(DLLDEST)$/description + +cp $? $@ + $(DLLDEST)$/META-INF$/manifest.xml : manifest.xml - -mkdir -p $(DLLDEST)$/META-INF + mkdir -p $(DLLDEST)$/META-INF +cp $? $@ $(DLLDEST)$/description.xml : description.xml - +cp $? $@ + +sed -s -e 's/@EXTENSION_VERSION@/$(PQ_SDBC_VERSION)/' < $? > $@ $(DLLDEST)$/postgresql.xcu : postgresql.xcu - -rm -f $@ + rm -f $@ cat postgresql.xcu > $@ strip : diff --git a/connectivity/source/drivers/postgresql/postgresql.xcu b/connectivity/source/drivers/postgresql/postgresql.xcu index 3f3c93cd0bb3..67b6668844dd 100644 --- a/connectivity/source/drivers/postgresql/postgresql.xcu +++ b/connectivity/source/drivers/postgresql/postgresql.xcu @@ -32,7 +32,7 @@ <value>org.openoffice.comp.connectivity.pq.Driver</value> </prop> <prop oor:name="DriverTypeDisplayName" oor:type="xs:string"> - <value xml:lang="en-US">postgresql</value> + <value xml:lang="en-US">PostgreSQL</value> </prop> <node oor:name="Properties"> </node> |