Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Provide system property to not unpack dlls' into parent dir #12

Merged
merged 1 commit into from
Jan 21, 2015
Merged

Provide system property to not unpack dlls' into parent dir #12

merged 1 commit into from
Jan 21, 2015

Conversation

os97673
Copy link
Contributor

@os97673 os97673 commented Dec 19, 2014

In our (Idea) case we do not want Winp to unpack dlls in parent dir because we may not have access to it, thus we have added a new property to control this behavior.

@oleg-nenashev
Copy link
Member

// previous conversation is available in #11
The PR LGTM

@os97673
Copy link
Contributor Author

os97673 commented Jan 3, 2015

@kohsuke do I need to do anything else to improve the patch?

@oleg-nenashev
Copy link
Member

If there's no response from @kohsuke, I'll merge and release changes on the next week.

P.S/Off-topic:
I would start documenting system properties somewhere. There is a public Javadoc at http://winp.kohsuke.org/apidocs/index.html, but Javadoc is not so flexible as Doxygen. It would be great to have a specific annotation and a processor to generate documentation pages (especially for Jenkins Wiki)

@os97673
Copy link
Contributor Author

os97673 commented Jan 20, 2015

It would be nice to have a released version of the library (with the PR merged) before March ;)

@oleg-nenashev
Copy link
Member

New Year weeks are too long :(
I also discovered that I have no access to winp.
I'll ping @kohsuke on the Jenkins governance meeting tomorrow (if it happens)

@os97673
Copy link
Contributor Author

os97673 commented Jan 20, 2015

thanks

@oleg-nenashev
Copy link
Member

kohsuke added a commit that referenced this pull request Jan 21, 2015
Provide system property to not unpack dlls' into parent dir
@kohsuke kohsuke merged commit 3102951 into jenkinsci:master Jan 21, 2015
@os97673
Copy link
Contributor Author

os97673 commented Jan 22, 2015

Thank you. When we can expect a new version of the library with the changes included?

@oleg-nenashev oleg-nenashev added this to the 1.23 milestone Jan 23, 2015
@oleg-nenashev
Copy link
Member

Created https://github.com/kohsuke/winp/releases/tag/1.23-beta
The build process have been migrated to the new Visual Studio version, so it would be great to perform some tests before the release

@os97673
Copy link
Contributor Author

os97673 commented Jan 24, 2015

Agree. Testing is good :) Do you need any help?

@oleg-nenashev
Copy link
Member

Currently I'm waiting for https://issues.sonatype.org/browse/OSSRH-13404 to be able to release the library. ETA - beginning of the next week.

My test app works well on 64-bit Win7 host. It frequently terminates windows processes, so I suppose the 64-bit configuration has been migrated correctly. Hopefully I'll find some time to try Jenkins on other OS and 32-bit platforms as well.

I could also try to patch TeamCity (I suppose it and IDEA use the same integration layer), but actually I would prefer to leave such steps to JetBrains.

@os97673 os97673 deleted the jb-patch branch February 2, 2015 18:48
@os97673
Copy link
Contributor Author

os97673 commented Feb 2, 2015

TeamCity doesn't use winp, so it looks like there is no need to change anything there.

@oleg-nenashev
Copy link
Member

I see it in %BUILD_AGENT_ROOT%\tools\idea\lib on Windows agents (version 1.21-patched). Probably, TeamCity takes it from IDEA components :)

I got all required permissions, hence I can release the library at any moment.
There're too much verification efforts for a small patch. I'll have to start working on #15 at some point, so it's better to have a test environment.

@os97673
Copy link
Contributor Author

os97673 commented Feb 7, 2015

I see it in %BUILD_AGENT_ROOT%\tools\idea\lib on Windows agents (version 1.21-patched). Probably, TeamCity takes it from IDEA components :)

it is just the library Idea uses. Could you please release 1.23 so I could replace this patched version with new unpatched one. We have couple bugs for which we need logging which was added in 1.22 and so we need to update the lib anyway and it would be better to do it once (and w/o patching)

@oleg-nenashev
Copy link
Member

@os97673
The release has been slightly delayed due to #16
The new version has been released on Maven Central => it should become available soon

@os97673
Copy link
Contributor Author

os97673 commented Feb 17, 2015

@oleg-nenashev great news, thanks.

oleg-nenashev added a commit to oleg-nenashev/jenkins that referenced this pull request Nov 6, 2016
…-20913](https://issues.jenkins-ci.org/browse/JENKINS-20913)

### Changes to be picked

### 1.24

Release date: Nov 2, 2016

* [Issue #22](jenkinsci/winp#22) - Winp sometimes kills random processes when using killRecursive. ([PR #23](jenkinsci/winp#23))
* [WINP-10](https://java.net/jira/browse/WINP-10) - Fix for `getCmdLineAndEnvVars()` which fails on x64 versions of Windows. ([PR #20](jenkinsci/winp#20))
* [Issue #24](jenkinsci/winp#24) - Wrong folder when using the `winp.folder.preferred` system property (parent instead of the actual folder). ([PR #25](jenkinsci/winp#25))
* [Issue #26](jenkinsci/winp#26), [JENKINS-20913](https://issues.jenkins-ci.org/browse/JENKINS-20913) - Native class now tries loading DLLs via the temp location. ([PR #27](jenkinsci/winp#27))

### 1.23

Release date: Fev 16, 2015

* Migrate native components to Visual Studio Community 2013. ([PR #14](jenkinsci/winp#14))
* Provide a `winp.unpack.dll.to.parent.dir` property, which disables DLL unpacking to the parent dir. ([PR #14](jenkinsci/winp#12))
oleg-nenashev added a commit to jenkinsci/jenkins that referenced this pull request Nov 27, 2016
…-20913](https://issues.jenkins-ci.org/browse/JENKINS-20913) (#2619)

### Changes to be picked

### 1.24

Release date: Nov 2, 2016

* [Issue #22](jenkinsci/winp#22) - Winp sometimes kills random processes when using killRecursive. ([PR #23](jenkinsci/winp#23))
* [WINP-10](https://java.net/jira/browse/WINP-10) - Fix for `getCmdLineAndEnvVars()` which fails on x64 versions of Windows. ([PR #20](jenkinsci/winp#20))
* [Issue #24](jenkinsci/winp#24) - Wrong folder when using the `winp.folder.preferred` system property (parent instead of the actual folder). ([PR #25](jenkinsci/winp#25))
* [Issue #26](jenkinsci/winp#26), [JENKINS-20913](https://issues.jenkins-ci.org/browse/JENKINS-20913) - Native class now tries loading DLLs via the temp location. ([PR #27](jenkinsci/winp#27))

### 1.23

Release date: Fev 16, 2015

* Migrate native components to Visual Studio Community 2013. ([PR #14](jenkinsci/winp#14))
* Provide a `winp.unpack.dll.to.parent.dir` property, which disables DLL unpacking to the parent dir. ([PR #14](jenkinsci/winp#12))
olivergondza pushed a commit to jenkinsci/jenkins that referenced this pull request Dec 6, 2016
…-20913](https://issues.jenkins-ci.org/browse/JENKINS-20913) (#2619)

### Changes to be picked

### 1.24

Release date: Nov 2, 2016

* [Issue #22](jenkinsci/winp#22) - Winp sometimes kills random processes when using killRecursive. ([PR #23](jenkinsci/winp#23))
* [WINP-10](https://java.net/jira/browse/WINP-10) - Fix for `getCmdLineAndEnvVars()` which fails on x64 versions of Windows. ([PR #20](jenkinsci/winp#20))
* [Issue #24](jenkinsci/winp#24) - Wrong folder when using the `winp.folder.preferred` system property (parent instead of the actual folder). ([PR #25](jenkinsci/winp#25))
* [Issue #26](jenkinsci/winp#26), [JENKINS-20913](https://issues.jenkins-ci.org/browse/JENKINS-20913) - Native class now tries loading DLLs via the temp location. ([PR #27](jenkinsci/winp#27))

### 1.23

Release date: Fev 16, 2015

* Migrate native components to Visual Studio Community 2013. ([PR #14](jenkinsci/winp#14))
* Provide a `winp.unpack.dll.to.parent.dir` property, which disables DLL unpacking to the parent dir. ([PR #14](jenkinsci/winp#12))
(cherry picked from commit 63c2f6c)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants