Skip to content

Commit

Permalink
Revert "packaging sync with newstyle"
Browse files Browse the repository at this point in the history
This reverts commit 6b3de13.
  • Loading branch information
emmanuelmathot committed Jun 10, 2019
1 parent 6b3de13 commit 619f757
Show file tree
Hide file tree
Showing 3 changed files with 33 additions and 2 deletions.
3 changes: 2 additions & 1 deletion Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,8 @@ pipeline {
stage('Build') {
steps {
echo "Build .NET application"
sh "msbuild /t:build /p:Configuration=DEBUG /Restore:true"
sh 'nuget restore -MSBuildVersion 14'
sh "xbuild /p:Configuration=DEBUG"
sh 'cp -r Terradue.OpenSearch.Client/bin $WORKSPACE/build/SOURCES/'
sh 'cp src/main/scripts/opensearch-client $WORKSPACE/build/SOURCES/'
sh 'cp -r packages $WORKSPACE/build/SOURCES/'
Expand Down
30 changes: 30 additions & 0 deletions Terradue.OpenSearch.Client.nuspec
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
<?xml version="1.0" encoding="utf-8"?>
<package >
<metadata>
<id>Terradue.OpenSearch.Client</id>
<version>1.5.3</version>
<authors>Terradue</authors>
<owners>Terradue</owners>
<licenseUrl>https://github.com/Terradue/DotNetOpenSearchClient/blob/master/LICENSE</licenseUrl>
<projectUrl>https://github.com/Terradue/DotNetOpenSearchClient</projectUrl>
<requireLicenseAcceptance>false</requireLicenseAcceptance>
<description>Generic OpenSearch Client</description>
<copyright>Copyright 2014</copyright>
<tags>OpenSearch</tags>
<dependencies>
<dependency id="Terradue.ServiceModel.Syndication" version="1.0.0" />
<dependency id="Terradue.OpenSearch" version="[1.11.12,1.12)" />
<dependency id="Terradue.GeoJson" version="[1.5.6,1.6)" />
<dependency id="Terradue.Metadata.EarthObservation" version="[1.3.4,)" />
<dependency id="Terradue.OpenSearch.GeoJson" version="[1.3.2,)" />
<dependency id="Terradue.OpenSearch.RdfEO" version="[1.3.4,)" />
<dependency id="log4net" version="[2.0.0]" />
<dependency id="Mono.Addins" version="[1.2]" />
</dependencies>
</metadata>
<files>
<file src="Terradue.OpenSearch.Client/bin/OpenSearchClient.exe" target="lib/net40" />
<file src="Terradue.OpenSearch.Client/bin/Terradue.OpenSearch.Model.dll" target="lib/net40" />
<file src="Terradue.OpenSearch.Client/bin/Terradue.OpenSearch.Model.Base.dll" target="lib/net40" />
</files>
</package>
2 changes: 1 addition & 1 deletion opensearch-client.spec
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ Generic OpenSearch Client giving the ability to retrieve element values from gen

%install
mkdir -p %{buildroot}/usr/lib/opensearch-client
cp -r %{_sourcedir}/bin/Debug/net4.5* %{buildroot}/usr/lib/opensearch-client
cp -r %{_sourcedir}/bin/* %{buildroot}/usr/lib/opensearch-client
mkdir -p %{buildroot}/usr/bin/
cp %{_sourcedir}/opensearch-client %{buildroot}/usr/bin/
mkdir -p %{buildroot}/usr/local/lib/
Expand Down

0 comments on commit 619f757

Please sign in to comment.