Merge pull request #957 from praminda/master

Fix build issues
wso2 · Jan 29, 2020 · 01ed7e3 · 01ed7e3
2 parents db5ac04 + 4f8fce8
commit 01ed7e3
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 5 deletions.
diff --git a/components/micro-gateway-core/pom.xml b/components/micro-gateway-core/pom.xml
@@ -150,6 +150,27 @@
                     </execution>
                 </executions>
             </plugin>
+            <plugin>
+                <artifactId>maven-antrun-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <phase>process-resources</phase>
+                        <goals>
+                            <goal>run</goal>
+                        </goals>
+                        <configuration>
+                            <tasks>
+                                <replaceregexp
+                                    file="src/main/ballerina/Ballerina.toml"
+                                    match="org\.wso2\.micro\.gateway\.core-.*.jar"
+                                    replace="org.wso2.micro.gateway.core-${project.version}.jar"
+                                    byline="true"/>
+                            </tasks>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+
         </plugins>
 
     </build>

diff --git a/components/micro-gateway-core/scripts/ballerina-build.bat b/components/micro-gateway-core/scripts/ballerina-build.bat
@@ -17,16 +17,16 @@ REM  limitations under the License.
 SET BALLERINA_HOME=%1
 SET MAVEN_PROJECT_ROOT=%2
 SET BAL_EXEC="%BALLERINA_HOME%\bin\ballerina"
-SET GATEWAY_PROJECT="%MAVEN_PROJECT_ROOT%\src\main\ballerina\"
+SET GATEWAY_PROJECT="%MAVEN_PROJECT_ROOT%\src\main\ballerina"
 
 REM Quietly delete the directory structure in %GATEWAY_PROJECT%\target
 RMDIR /S /Q %GATEWAY_PROJECT%\target
 
 PUSHD %GATEWAY_PROJECT%
-    %BAL_EXEC% build -c --experimental gateway
+CALL %BAL_EXEC% build -c --experimental gateway
 POPD
 
-cp -r %GATEWAY_PROJECT%\target\caches\bir_cache %MAVEN_PROJECT_ROOT%\target
-cp -r %GATEWAY_PROJECT%\target\caches\jar_cache %MAVEN_PROJECT_ROOT%\target
-cp -r %GATEWAY_PROJECT%\target\balo %MAVEN_PROJECT_ROOT%\target
+xcopy /Y /I /E %GATEWAY_PROJECT%\target\caches\bir_cache %MAVEN_PROJECT_ROOT%\target\bir_cache
+xcopy /Y /I /E %GATEWAY_PROJECT%\target\caches\jar_cache %MAVEN_PROJECT_ROOT%\target\jar_cache
+xcopy /Y /I /E %GATEWAY_PROJECT%\target\balo %MAVEN_PROJECT_ROOT%\target\balo