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鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Windows script fix #577

Merged
merged 10 commits into from Jan 3, 2018

Conversation

Projects
None yet
3 participants
@sake92
Contributor

sake92 commented Dec 31, 2017

This PR fixes most of the issues with using CBT on Windows:

  • cache strings are now platform independent as far as they can, by using pip(unixPath: String) (path-independent-path, just converts slashes to backslashes)
  • batch script is now working properly and is usable

Some minor issues left:

  • improve Nailgun support, java.net.SocketException: Connection reset
  • time function
  • nailgun log files are impossible to write to, when ng-server is up (.. >> %nailgun_out% 2>> %nailgun_err%)
  • eval can't be used with single-quotes since CMD treats them specially... You can use double-quotes but then you can't use String literals 馃槃

sake92 added some commits Dec 3, 2017

- rewrote main logic to reflect that from bash script
- removed using temp file
- made helper functions (like in bash script)
- fixed 'nailgun' and 'kill' issues
- cleaned batch script, capitalized CMD commands
@CLAassistant

This comment has been minimized.

CLAassistant commented Dec 31, 2017

CLA assistant check
All committers have signed the CLA.

// when replacing the path with \ Java treats it like escape character,
// that's why we need Matcher.quoteReplacement
return pathWithSlashes.replaceAll("/", Matcher.quoteReplacement(File.separator));
}
}

This comment has been minimized.

@cvogt

cvogt Dec 31, 2017

Owner

This file is auto-generated ( see comment in top line ). Editing it by hand is not the way to go.

This comment has been minimized.

@sake92

sake92 Dec 31, 2017

Contributor

Oh, I didn't see that. :/ Guess I'll have to find another way..

This comment has been minimized.

@sake92

sake92 Jan 1, 2018

Contributor

How about this solution?
Btw, when I do cbt tools cbtEarlyDependencies it generates the file in cbt/nailgun_launcher and not in cbt/nailgun_launcher/src/cbt.. Is that expected?

This comment has been minimized.

@cvogt

cvogt Jan 3, 2018

Owner

looks like a bug

@cvogt

This comment has been minimized.

Owner

cvogt commented Jan 3, 2018

great stuff :)

@cvogt cvogt merged commit 3fbf948 into cvogt:master Jan 3, 2018

2 checks passed

ci/circleci Your tests passed on CircleCI!
Details
license/cla Contributor License Agreement is signed.
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment