feat(common): allow using legacy wrappers (i.e .bat, for maven mostly)

tinesoft · Jul 3, 2022 · 7a13720 · 7a13720
1 parent f426575
commit 7a13720
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 7 deletions.
diff --git a/packages/common/src/lib/core/jvm/builder-core.interface.ts b/packages/common/src/lib/core/jvm/builder-core.interface.ts
@@ -19,7 +19,7 @@ export interface BuilderCommandAliasMapper {
 export interface BuilderCore {
   getBuildSystemType();
 
-  getExecutable(ignoreWrapper: boolean);
+  getExecutable(ignoreWrapper: boolean, useLegacyWrapper: boolean);
 
   getCommand(alias: BuilderCommandAliasType): string;
 }

diff --git a/packages/common/src/lib/core/jvm/constants.ts b/packages/common/src/lib/core/jvm/constants.ts
@@ -6,6 +6,9 @@ export const GRADLE_EXECUTABLE = 'gradle';
 
 export const MAVEN_WRAPPER_EXECUTABLE = IS_WINDOWS ? 'mvnw.cmd' : './mvnw';
 
+// previous versions of the wrapper were using '.bat' extension for Windows executable
+export const MAVEN_WRAPPER_EXECUTABLE_LEGACY = IS_WINDOWS ? 'mvnw.bat' : './mvnw';
+
 export const GRADLE_WRAPPER_EXECUTABLE = IS_WINDOWS
   ? 'gradlew.bat'
   : './gradlew';
diff --git a/packages/common/src/lib/core/jvm/gradle-builder.class.ts b/packages/common/src/lib/core/jvm/gradle-builder.class.ts
@@ -13,7 +13,7 @@ export class GradleBuilder implements BuilderCore {
     return BuildSystem.GRADLE;
   }
 
-  getExecutable(ignoreWrapper: boolean) {
+  getExecutable(ignoreWrapper: boolean, useLegacyWrapper = false) {
     return ignoreWrapper ? GRADLE_EXECUTABLE : GRADLE_WRAPPER_EXECUTABLE;
   }
 

diff --git a/packages/common/src/lib/core/jvm/maven-builder.class.ts b/packages/common/src/lib/core/jvm/maven-builder.class.ts
@@ -1,4 +1,4 @@
-import { MAVEN_EXECUTABLE, MAVEN_WRAPPER_EXECUTABLE } from './constants';
+import { MAVEN_EXECUTABLE, MAVEN_WRAPPER_EXECUTABLE, MAVEN_WRAPPER_EXECUTABLE_LEGACY } from './constants';
 import {
   BuilderCommandAliasMapper,
   BuilderCommandAliasType,
@@ -13,8 +13,11 @@ export class MavenBuilder implements BuilderCore {
     return BuildSystem.MAVEN;
   }
 
-  getExecutable(ignoreWrapper: boolean) {
-    return ignoreWrapper ? MAVEN_EXECUTABLE : MAVEN_WRAPPER_EXECUTABLE;
+  getExecutable(ignoreWrapper: boolean, useLegacyWrapper = false) {
+    if(ignoreWrapper)
+      return  MAVEN_EXECUTABLE;
+    else 
+      return useLegacyWrapper ? MAVEN_WRAPPER_EXECUTABLE_LEGACY : MAVEN_WRAPPER_EXECUTABLE;
   }
 
   getCommand(alias: BuilderCommandAliasType) {

diff --git a/packages/common/src/lib/core/jvm/utils.ts b/packages/common/src/lib/core/jvm/utils.ts
@@ -14,12 +14,12 @@ export function runBuilderCommand(
   commandAlias: BuilderCommandAliasType,
   getBuilder : (cwd: string) => BuilderCore,
   params: string[],
-  options: { cwd?: string; ignoreWrapper?: boolean } = { ignoreWrapper: false }
+  options: { cwd?: string; ignoreWrapper?: boolean, useLegacyWrapper?: boolean } = { ignoreWrapper: false, useLegacyWrapper: false }
 ): { success: boolean } {
   // Take the parameters or set defaults
   const cwd = options.cwd || process.cwd();
   const buildSystem = getBuilder(cwd);
-  const executable = buildSystem.getExecutable(options.ignoreWrapper);
+  const executable = buildSystem.getExecutable(options.ignoreWrapper, options.useLegacyWrapper);
   const command = buildSystem.getCommand(commandAlias);
   // Create the command to execute
   const execute = `${executable} ${command} ${(params || []).join(' ')}`;