Skip to content

Commit 94361a2

Browse files
jonilesjoniles
committed
Package sqlite-jdbc for .Net
1 parent 6769976 commit 94361a2

10 files changed

+51
-11
lines changed

‎.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
/lib.net/mpxj*.dll
99
/lib.net/poi*.dll
1010
/lib.net/rtfparserkit*.dll
11+
/lib.net/sqlite-jdbc*.dll
1112
/lib.net/MpxjUtilities.dll
1213
/lib.net/*.tlb
1314
/lib.net/*.bat

‎build.xml

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -117,11 +117,11 @@
117117
</target>
118118

119119
<target name="compile" depends="init,update-version-numbers" description="Compile Everything">
120-
<javac srcdir="${basedir}/src" destdir="${classes.dir}" classpath="${classpath}:${poi.classpath}:${rtfparserkit.classpath}" debug="on" source="${target-jvm-version}" target="${target-jvm-version}" includeantruntime="false" excludes="net/sf/mpxj/explorer/**">
120+
<javac srcdir="${basedir}/src" destdir="${classes.dir}" classpath="${classpath}:${poi.classpath}:${rtfparserkit.classpath}:${sqlite-jdbc.classpath}" debug="on" source="${target-jvm-version}" target="${target-jvm-version}" includeantruntime="false" excludes="net/sf/mpxj/explorer/**">
121121
<compilerarg line="-encoding cp1252" />
122122
<!-- <compilerarg value="-Xlint"/> -->
123123
</javac>
124-
<javac srcdir="${basedir}/src.test" destdir="${classes.test.dir}" classpath="${classpath}:${classes.dir}:${poi.classpath}:${rtfparserkit.classpath}:${junit.classpath}" debug="on" source="${target-jvm-version}" target="${target-jvm-version}" includeantruntime="false">
124+
<javac srcdir="${basedir}/src.test" destdir="${classes.test.dir}" classpath="${classpath}:${classes.dir}:${poi.classpath}:${rtfparserkit.classpath}:${sqlite-jdbc.classpath}:${junit.classpath}" debug="on" source="${target-jvm-version}" target="${target-jvm-version}" includeantruntime="false">
125125
<compilerarg line="-encoding cp1252" />
126126
<!-- <compilerarg value="-Xlint"/> -->
127127
</javac>
@@ -151,7 +151,7 @@
151151
<target name="document" depends="init-props" description="Generate documentation">
152152
<delete dir="${doc.dir}" />
153153
<mkdir dir="${doc.dir}" />
154-
<javadoc sourcepath="${basedir}/src" classpath="${classpath}:${poi.classpath}:${rtfparserkit.classpath}:${junit.classpath}" packagenames="net.sf.mpxj.*" destdir="${doc.dir}" verbose="no" access="public">
154+
<javadoc sourcepath="${basedir}/src" classpath="${classpath}:${poi.classpath}:${rtfparserkit.classpath}:${sqlite-jdbc.classpath}:${junit.classpath}" packagenames="net.sf.mpxj.*" destdir="${doc.dir}" verbose="no" access="public">
155155
</javadoc>
156156
</target>
157157

@@ -210,11 +210,11 @@
210210
<include name="**/*.java" />
211211
</replace>
212212

213-
<javac srcdir="${ikvm.src.dir}" destdir="${ikvm.classes.dir}" classpath="${classpath}:${poi.classpath}:${rtfparserkit.classpath}:${ikvm.lib.dir}/mscorlib.jar" debug="on" source="${target-jvm-version}" target="${target-jvm-version}" includeantruntime="false" excludes="net/sf/mpxj/explorer/**">
213+
<javac srcdir="${ikvm.src.dir}" destdir="${ikvm.classes.dir}" classpath="${classpath}:${poi.classpath}:${rtfparserkit.classpath}:${sqlite-jdbc.classpath}:${ikvm.lib.dir}/mscorlib.jar" debug="on" source="${target-jvm-version}" target="${target-jvm-version}" includeantruntime="false" excludes="net/sf/mpxj/explorer/**">
214214
<compilerarg line="-encoding cp1252" />
215215
</javac>
216216

217-
<javac srcdir="${ikvm.src.test.dir}" destdir="${ikvm.classes.test.dir}" classpath="${classpath}:${ikvm.classes.dir}:${poi.classpath}:${rtfparserkit.classpath}:${junit.classpath}:${ikvm.lib.dir}/mscorlib.jar" debug="on" source="${target-jvm-version}" target="${target-jvm-version}" includeantruntime="false">
217+
<javac srcdir="${ikvm.src.test.dir}" destdir="${ikvm.classes.test.dir}" classpath="${classpath}:${ikvm.classes.dir}:${poi.classpath}:${rtfparserkit.classpath}:${sqlite-jdbc.classpath}:${junit.classpath}:${ikvm.lib.dir}/mscorlib.jar" debug="on" source="${target-jvm-version}" target="${target-jvm-version}" includeantruntime="false">
218218
<compilerarg line="-encoding cp1252" />
219219
</javac>
220220

@@ -233,6 +233,7 @@
233233
<pathelement location="${junit.classpath}" />
234234
<pathelement location="${poi.classpath}" />
235235
<pathelement location="${rtfparserkit.classpath}" />
236+
<pathelement location="${sqlite-jdbc.classpath}" />
236237
</classpath>
237238
</java>
238239

@@ -246,6 +247,7 @@
246247
<pathelement location="${junit.classpath}" />
247248
<pathelement location="${poi.classpath}" />
248249
<pathelement location="${rtfparserkit.classpath}" />
250+
<pathelement location="${sqlite-jdbc.classpath}" />
249251
</classpath>
250252
</java>
251253

@@ -267,21 +269,21 @@
267269

268270
<!-- Generate the original unmapped DLL -->
269271
<exec executable="${ikvmc.exe}" dir="${basedir}">
270-
<arg line="-nowarn:0003 -out:${mpxj.dll} -target:library -keyfile:${mpxj.snk} -version:${current.version}.0 -reference:${poi.dll} -reference:${rtfparserkit.dll} -reference:mscorlib.dll ${ikvm.working.dir}\mpxj.jar" />
272+
<arg line="-nowarn:0003 -out:${mpxj.dll} -target:library -keyfile:${mpxj.snk} -version:${current.version}.0 -reference:${poi.dll} -reference:${rtfparserkit.dll} -reference:${sqlite-jdbc.dll} -reference:mscorlib.dll ${ikvm.working.dir}\mpxj.jar" />
271273
</exec>
272274

273275
<exec executable="${ikvmc.exe}" dir="${basedir}">
274-
<arg line="-nowarn:0003 -out:${mpxj-test.dll} -target:library -keyfile:${mpxj.snk} -version:${current.version}.0 -reference:${poi.dll} -reference:${rtfparserkit.dll} -reference:${mpxj.dll} -reference:${junit.dll} -reference:mscorlib.dll ${ikvm.working.dir}\mpxj-test.jar" />
276+
<arg line="-nowarn:0003 -out:${mpxj-test.dll} -target:library -keyfile:${mpxj.snk} -version:${current.version}.0 -reference:${poi.dll} -reference:${rtfparserkit.dll} -reference:${sqlite-jdbc.dll} -reference:${mpxj.dll} -reference:${junit.dll} -reference:mscorlib.dll ${ikvm.working.dir}\mpxj-test.jar" />
275277
</exec>
276278

277279
<!-- Generate a mapped DLL for VB, avoids name clashes due to VB's case insensitivity -->
278280
<exec executable="${ikvmc.exe}" dir="${basedir}">
279-
<arg line="-nowarn:0003 -out:${mpxj-for-vb.dll} -target:library -keyfile:${mpxj.snk} -version:${current.version}.0 -remap:${ikvm.working.dir}/ikvm-remap-vb.xml -reference:${poi.dll} -reference:${rtfparserkit.dll} -reference:mscorlib.dll ${ikvm.working.dir}\mpxj.jar" />
281+
<arg line="-nowarn:0003 -out:${mpxj-for-vb.dll} -target:library -keyfile:${mpxj.snk} -version:${current.version}.0 -remap:${ikvm.working.dir}/ikvm-remap-vb.xml -reference:${poi.dll} -reference:${rtfparserkit.dll} -reference:${sqlite-jdbc.dll} -reference:mscorlib.dll ${ikvm.working.dir}\mpxj.jar" />
280282
</exec>
281283

282284
<!-- Generate a mapped DLL for C# and other .Net languages -->
283285
<exec executable="${ikvmc.exe}" dir="${basedir}">
284-
<arg line="-nowarn:0003 -out:${mpxj-for-csharp.dll} -target:library -keyfile:${mpxj.snk} -version:${current.version}.0 -remap:${ikvm.working.dir}/ikvm-remap-csharp.xml -reference:${poi.dll} -reference:${rtfparserkit.dll} -reference:mscorlib.dll -reference:system.dll ${ikvm.working.dir}\mpxj.jar" />
286+
<arg line="-nowarn:0003 -out:${mpxj-for-csharp.dll} -target:library -keyfile:${mpxj.snk} -version:${current.version}.0 -remap:${ikvm.working.dir}/ikvm-remap-csharp.xml -reference:${poi.dll} -reference:${rtfparserkit.dll} -reference:${sqlite-jdbc.dll} -reference:mscorlib.dll -reference:system.dll ${ikvm.working.dir}\mpxj.jar" />
285287
</exec>
286288

287289
<!-- Export a Type Library (TLB) for each assembly. This step will fail if the assemblies are in the GAC! -->
@@ -444,6 +446,7 @@
444446
<path id="emmarun.path">
445447
<path refid="poi.path" />
446448
<path refid="rtfparserkit.path" />
449+
<path refid="sqlite-jdbc.path" />
447450
<path refid="junit.path" />
448451
<pathelement location="${basedir}/mpxj.jar" />
449452
</path>

‎lib.net/ikvm-native-win32-x64.dll

69.5 KB
Binary file not shown.

‎lib.net/ikvm-native-win32-x86.dll

67.5 KB
Binary file not shown.

‎nuget/mpxj-for-csharp.nuspec

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,5 +18,8 @@
1818
<file src="..\lib.net\rtfparserkit*.*" target="lib"/>
1919
<file src="..\lib.net\sqlite-jdbc*.*" target="lib"/>
2020
<file src="..\lib.net\MpxjUtilities.*" target="lib"/>
21+
<file src="..\lib.net\ikvm-native-win32-x86.dll" target="build"/>
22+
<file src="..\lib.net\ikvm-native-win32-x64.dll" target="build"/>
23+
<file src="net.sf.mpxj-for-csharp.targets" target="build"/>
2124
</files>
2225
</package>

‎nuget/mpxj-for-vb.nuspec

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,9 @@
1717
<file src="..\lib.net\poi*.*" target="lib"/>
1818
<file src="..\lib.net\rtfparserkit*.*" target="lib"/>
1919
<file src="..\lib.net\sqlite-jdbc*.*" target="lib"/>
20-
<file src="..\lib.net\MpxjUtilities.*" target="lib"/>
20+
<file src="..\lib.net\MpxjUtilities.*" target="lib"/>
21+
<file src="..\lib.net\ikvm-native-win32-x86.dll" target="build"/>
22+
<file src="..\lib.net\ikvm-native-win32-x64.dll" target="build"/>
23+
<file src="net.sf.mpxj-for-vb.targets" target="build"/>
2124
</files>
2225
</package>

‎nuget/mpxj.nuspec

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,9 @@
1717
<file src="..\lib.net\poi*.*" target="lib"/>
1818
<file src="..\lib.net\rtfparserkit*.*" target="lib"/>
1919
<file src="..\lib.net\sqlite-jdbc*.*" target="lib"/>
20-
<file src="..\lib.net\MpxjUtilities.*" target="lib"/>
20+
<file src="..\lib.net\MpxjUtilities.*" target="lib"/>
21+
<file src="..\lib.net\ikvm-native-win32-x86.dll" target="build"/>
22+
<file src="..\lib.net\ikvm-native-win32-x64.dll" target="build"/>
23+
<file src="net.sf.mpxj.targets" target="build"/>
2124
</files>
2225
</package>

‎nuget/net.sf.mpxj-for-csharp.targets

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2+
<ItemGroup>
3+
<NativeLibs Include="$(MSBuildThisFileDirectory)**\*.dll" />
4+
<None Include="@(NativeLibs)">
5+
<Link>%(RecursiveDir)%(FileName)%(Extension)</Link>
6+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
7+
</None>
8+
</ItemGroup>
9+
</Project>

‎nuget/net.sf.mpxj-for-vb.targets

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2+
<ItemGroup>
3+
<NativeLibs Include="$(MSBuildThisFileDirectory)**\*.dll" />
4+
<None Include="@(NativeLibs)">
5+
<Link>%(RecursiveDir)%(FileName)%(Extension)</Link>
6+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
7+
</None>
8+
</ItemGroup>
9+
</Project>

‎nuget/net.sf.mpxj.targets

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2+
<ItemGroup>
3+
<NativeLibs Include="$(MSBuildThisFileDirectory)**\*.dll" />
4+
<None Include="@(NativeLibs)">
5+
<Link>%(RecursiveDir)%(FileName)%(Extension)</Link>
6+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
7+
</None>
8+
</ItemGroup>
9+
</Project>

0 commit comments

Comments
 (0)