Skip to content

Commit 27ea297

Browse files
fbriconNikolasKomonen
authored andcommitted
Replaces references to *-all.jar by *-uber.jar (#103)
also skip building the server extensions, as we don't use them Signed-off-by: Fred Bricon <[email protected]>
1 parent bf81ad9 commit 27ea297

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

gulpfile.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ gulp.task('tslint', () => {
1111
});
1212

1313
gulp.task('build_server', function(done) {
14-
cp.execSync(mvnw()+ " -o clean verify -DskipTests", {cwd:server_dir, stdio:[0,1,2]} );
15-
gulp.src(server_dir +'/org.eclipse.lsp4xml/target/org.eclipse.lsp4xml-all.jar')
14+
cp.execSync(mvnw()+ " -o clean verify -DskipTests -pl \"!extensions,!extensions/org.eclipse.lsp4xml.extensions.emmet,!extensions/org.eclipse.lsp4xml.extensions.web\"", {cwd:server_dir, stdio:[0,1,2]} );
15+
gulp.src(server_dir +'/org.eclipse.lsp4xml/target/org.eclipse.lsp4xml-uber.jar')
1616
.pipe(gulp.dest('./server'));
1717
done();
1818
});

src/javaServerStarter.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ function prepareParams(requirements: RequirementsData): string[] {
2929
let vmargs = workspace.getConfiguration("xml").get("server.vmargs", '');
3030
parseVMargs(params, vmargs);
3131
let server_home: string = path.resolve(__dirname, '../../server');
32-
let launchersFound: Array<string> = glob.sync('**/org.eclipse.lsp4xml-all.jar', { cwd: server_home });
32+
let launchersFound: Array<string> = glob.sync('**/org.eclipse.lsp4xml-uber.jar', { cwd: server_home });
3333
if (launchersFound.length) {
3434
params.push('-jar'); params.push(path.resolve(server_home, launchersFound[0]));
3535
} else {

0 commit comments

Comments
 (0)