Skip to content

Windows script fix#577

Merged
cvogt merged 10 commits into
cvogt:masterfrom
sake92:windows-script-fix
Jan 3, 2018
Merged

Windows script fix#577
cvogt merged 10 commits into
cvogt:masterfrom
sake92:windows-script-fix

Conversation

@sake92

@sake92 sake92 commented Dec 31, 2017

Copy link
Copy Markdown
Contributor

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 😄

@CLAassistant

CLAassistant commented Dec 31, 2017

Copy link
Copy Markdown

CLA assistant check
All committers have signed the CLA.

// that's why we need Matcher.quoteReplacement
return pathWithSlashes.replaceAll("/", Matcher.quoteReplacement(File.separator));
}
}

Copy link
Copy Markdown
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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?

Copy link
Copy Markdown
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

looks like a bug

@cvogt

cvogt commented Jan 3, 2018

Copy link
Copy Markdown
Owner

great stuff :)

@cvogt
cvogt merged commit 3fbf948 into cvogt:master Jan 3, 2018
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.

3 participants