Patch files are auto-generated by the Ant script, verified by a build, then committed to the src/main/patch/js.patch so that the Maven build can use it. If we choose to try to manually maintain the patch files, we should comment out the auto-generation in the Ant build, otherwise as soon as someone uses it, it will blow away manual changes. And if you had auto-generated the patch file, it probably wouldn't have had formatting issues.
HTH, -Alex On 2/12/18, 8:26 AM, "Yishay Weiss" <yishayj...@hotmail.com> wrote: >Add, see my later mail. > >From: Gabe Harbs<mailto:harbs.li...@gmail.com> >Sent: Monday, February 12, 2018 6:23 PM >To: dev@royale.apache.org<mailto:dev@royale.apache.org> >Subject: Re: Build failed in Jenkins: royale-typedefs #139 > >What was it? Did you add a space, or remove a space? >> On Feb 12, 2018, at 6:11 PM, Yishay Weiss <yishayj...@hotmail.com> >>wrote: >> >> I fixed it for my machine. Hopefully Jenkins will be happy too. >> >> From: Gabe Harbs<mailto:harbs.li...@gmail.com> >> Sent: Monday, February 12, 2018 5:18 PM >> To: dev@royale.apache.org<mailto:dev@royale.apache.org> >> Subject: Re: Build failed in Jenkins: royale-typedefs #139 >> >> Does anyone understand the patch file syntax enough to guess what’s >>wrong? >> >>> On Feb 12, 2018, at 5:15 PM, Yishay Weiss <yishayj...@hotmail.com> >>>wrote: >>> >>> I have the same result with ant on my machine. It’s probably a >>>windows/mac thing. >>> >>> From: Piotr Zarzycki<mailto:piotrzarzyck...@gmail.com> >>> Sent: Monday, February 12, 2018 3:13 PM >>> To: dev@royale.apache.org<mailto:dev@royale.apache.org> >>> Subject: Re: Build failed in Jenkins: royale-typedefs #139 >>> >>> Locally I have same result. I tried couple of things but nothing help. >>>I >>> see that it is being applied by following command: >>> >>> [DEBUG] Executing command line: [C:\Program Files\Git\cmd\git.exe, >>>apply, >>> --ignore-whitespace, --whitespace=nowarn, >>> D:\Work\royale-sources\royale-typedefs\js/src/main/patch/js.patch] >>> error: corrupt patch at line 64 >>> >>> Thanks, Piotr >>> >>> >>> 2018-02-12 13:47 GMT+01:00 Gabe Harbs <harbs.li...@gmail.com>: >>> >>>> Thanks. >>>> >>>>> On Feb 12, 2018, at 2:43 PM, Piotr Zarzycki >>>>><piotrzarzyck...@gmail.com> >>>> wrote: >>>>> >>>>> Let me build typedefs locally by Maven will see. >>>>> >>>>> 2018-02-12 13:36 GMT+01:00 Gabe Harbs <harbs.li...@gmail.com>: >>>>> >>>>>> I have no idea why this failed. The patch applied on my machine and >>>>>>line >>>>>> 64 is an empty line. >>>>>> >>>>>> Maybe it’s a Windows line ending problem? >>>>>> >>>>>> Thoughts? >>>>>> Harbs >>>>>> >>>>>>> On Feb 12, 2018, at 2:12 PM, apacheroyal...@gmail.com wrote: >>>>>>> >>>>>>> See >>>>>>><https://na01.safelinks.protection.outlook.com/?url=http%3A%2F%2Fapa >>>>>>>cheroyaleci.westus2.cloudapp.azure.com&data=02%7C01%7Caharui%40adobe >>>>>>>.com%7Ca91f37b4a59c41d2dead08d5723574f0%7Cfa7b1b5a7b34438794aed2c178 >>>>>>>decee1%7C0%7C0%7C636540496276826984&sdata=LL61UmzMw2XOCgf3qyF5QdqkfK >>>>>>>iJJpsRUGawhg2Ub8s%3D&reserved=0: >>>>>> 8080/job/royale-typedefs/139/display/redirect> >>>>>>> >>>>>>> ------------------------------------------ >>>>>>> Started by upstream project "royale-compiler" build number 89 >>>>>>> originally caused by: >>>>>>> Started by timer >>>>>>> Building in workspace <http://apacheroyaleci. >>>> westus2.cloudapp.azure.com: >>>>>> 8080/job/royale-typedefs/ws/> >>>>>>>> git.exe rev-parse --is-inside-work-tree # timeout=10 >>>>>>> Fetching changes from the remote Git repository >>>>>>>> git.exe config remote.origin.url >>>>>>>>https://na01.safelinks.protection.outlook.com/?url=https%3A%2F%2Fgi >>>>>>>>thub.com%2Fapache%2F&data=02%7C01%7Caharui%40adobe.com%7Ca91f37b4a5 >>>>>>>>9c41d2dead08d5723574f0%7Cfa7b1b5a7b34438794aed2c178decee1%7C0%7C0%7 >>>>>>>>C636540496276826984&sdata=FXlM%2FFyn1mwiw%2BLJ94iCQbRKHmSodySX4xRIW >>>>>>>>lMMi8Q%3D&reserved=0 >>>>>> royale-typedefs.git # timeout=10 >>>>>>> Fetching upstream changes from >>>>>>>https://na01.safelinks.protection.outlook.com/?url=https%3A%2F%2Fgit >>>>>>>hub.com%2Fapache%2F&data=02%7C01%7Caharui%40adobe.com%7Ca91f37b4a59c >>>>>>>41d2dead08d5723574f0%7Cfa7b1b5a7b34438794aed2c178decee1%7C0%7C0%7C63 >>>>>>>6540496276826984&sdata=FXlM%2FFyn1mwiw%2BLJ94iCQbRKHmSodySX4xRIWlMMi >>>>>>>8Q%3D&reserved=0 >>>>>> royale-typedefs.git >>>>>>>> git.exe --version # timeout=10 >>>>>>>> git.exe fetch --tags --progress >>>>>>>>https://na01.safelinks.protection.outlook.com/?url=https%3A%2F%2Fgi >>>>>>>>thub.com%2Fapache%2F&data=02%7C01%7Caharui%40adobe.com%7Ca91f37b4a5 >>>>>>>>9c41d2dead08d5723574f0%7Cfa7b1b5a7b34438794aed2c178decee1%7C0%7C0%7 >>>>>>>>C636540496276826984&sdata=FXlM%2FFyn1mwiw%2BLJ94iCQbRKHmSodySX4xRIW >>>>>>>>lMMi8Q%3D&reserved=0 >>>>>> royale-typedefs.git +refs/heads/*:refs/remotes/origin/* >>>>>>>> git.exe rev-parse "refs/remotes/origin/develop^{commit}" # >>>>>>>>timeout=10 >>>>>>>> git.exe rev-parse "refs/remotes/origin/origin/develop^{commit}" # >>>>>> timeout=10 >>>>>>> Checking out Revision b50b80fa675d06c5b8e9145b1b3f2e54784f25a8 >>>>>> (refs/remotes/origin/develop) >>>>>>>> git.exe config core.sparsecheckout # timeout=10 >>>>>>>> git.exe checkout -f b50b80fa675d06c5b8e9145b1b3f2e54784f25a8 >>>>>>> Commit message: "Added overflowX and overflowY" >>>>>>>> git.exe rev-list --no-walk >>>>>>>>b50b80fa675d06c5b8e9145b1b3f2e54784f25a8 # >>>>>> timeout=10 >>>>>>> [royale-typedefs] $ cmd.exe /C >>>>>>>"C:\apache\apache-ant-1.9.9\bin\ant.bat >>>>>> main && exit %%ERRORLEVEL%%" >>>>>>> Buildfile: >>>>>>><https://na01.safelinks.protection.outlook.com/?url=http%3A%2F%2Fapa >>>>>>>cheroyaleci.westus2.cloudapp.azure.com&data=02%7C01%7Caharui%40adobe >>>>>>>.com%7Ca91f37b4a59c41d2dead08d5723574f0%7Cfa7b1b5a7b34438794aed2c178 >>>>>>>decee1%7C0%7C0%7C636540496276826984&sdata=LL61UmzMw2XOCgf3qyF5QdqkfK >>>>>>>iJJpsRUGawhg2Ub8s%3D&reserved=0: >>>>>> 8080/job/royale-typedefs/ws/build.xml> >>>>>>> >>>>>>> main: >>>>>>> >>>>>>> download: >>>>>>> [echo] >>>>>>><https://na01.safelinks.protection.outlook.com/?url=http%3A%2F%2Fapa >>>>>>>cheroyaleci.westus2.cloudapp.azure.com&data=02%7C01%7Caharui%40adobe >>>>>>>.com%7Ca91f37b4a59c41d2dead08d5723574f0%7Cfa7b1b5a7b34438794aed2c178 >>>>>>>decee1%7C0%7C0%7C636540496276826984&sdata=LL61UmzMw2XOCgf3qyF5QdqkfK >>>>>>>iJJpsRUGawhg2Ub8s%3D&reserved=0: >>>>>> 8080/job/royale-typedefs/ws/js/..> >>>>>>> [unjar] Expanding: C:\Program Files (x86)\Jenkins\workspace\ >>>>>> royale-compiler\compiler-jx\lib\google\closure-compiler\compiler.jar >>>> into >>>>>> >>>>>><https://na01.safelinks.protection.outlook.com/?url=http%3A%2F%2Fapac >>>>>>heroyaleci.westus2.cloudapp.azure.com&data=02%7C01%7Caharui%40adobe.c >>>>>>om%7Ca91f37b4a59c41d2dead08d5723574f0%7Cfa7b1b5a7b34438794aed2c178dec >>>>>>ee1%7C0%7C0%7C636540496276826984&sdata=LL61UmzMw2XOCgf3qyF5QdqkfKiJJp >>>>>>sRUGawhg2Ub8s%3D&reserved=0: >>>>>> 8080/job/royale-typedefs/ws/js/target/temp/externs> >>>>>>> [unzip] Expanding: >>>>>>><https://na01.safelinks.protection.outlook.com/?url=http%3A%2F%2Fapa >>>>>>>cheroyaleci.westus2.cloudapp.azure.com&data=02%7C01%7Caharui%40adobe >>>>>>>.com%7Ca91f37b4a59c41d2dead08d5723574f0%7Cfa7b1b5a7b34438794aed2c178 >>>>>>>decee1%7C0%7C0%7C636540496276826984&sdata=LL61UmzMw2XOCgf3qyF5QdqkfK >>>>>>>iJJpsRUGawhg2Ub8s%3D&reserved=0 >>>> : >>>>>> 8080/job/royale-typedefs/ws/js/target/temp/externs/externs.zip> >>>>>>into < >>>>>> >>>>>>https://na01.safelinks.protection.outlook.com/?url=http%3A%2F%2Fapach >>>>>>eroyaleci.westus2.cloudapp.azure.com&data=02%7C01%7Caharui%40adobe.co >>>>>>m%7Ca91f37b4a59c41d2dead08d5723574f0%7Cfa7b1b5a7b34438794aed2c178dece >>>>>>e1%7C0%7C0%7C636540496276826984&sdata=LL61UmzMw2XOCgf3qyF5QdqkfKiJJps >>>>>>RUGawhg2Ub8s%3D&reserved=0: >>>>>> 8080/job/royale-typedefs/ws/js/target/downloads> >>>>>>> [get] Getting: >>>>>>>https://na01.safelinks.protection.outlook.com/?url=https%3A%2F%2Fsto >>>>>>>rage.googleapis.com%2Fgoogle-code-archive-&data=02%7C01%7Caharui%40a >>>>>>>dobe.com%7Ca91f37b4a59c41d2dead08d5723574f0%7Cfa7b1b5a7b34438794aed2 >>>>>>>c178decee1%7C0%7C0%7C636540496276826984&sdata=UQHF9sVSrJYkUX17kA1fa7 >>>>>>>La9%2FMb%2B%2BZ86vsty5QlwRY%3D&reserved=0 >>>>>> downloads/v2/code.google.com/closureidl/svg.js >>>>>>> [get] To: >>>>>>><https://na01.safelinks.protection.outlook.com/?url=http%3A%2F%2Fapa >>>>>>>cheroyaleci.westus2.cloudapp.azure.com&data=02%7C01%7Caharui%40adobe >>>>>>>.com%7Ca91f37b4a59c41d2dead08d5723574f0%7Cfa7b1b5a7b34438794aed2c178 >>>>>>>decee1%7C0%7C0%7C636540496276826984&sdata=LL61UmzMw2XOCgf3qyF5QdqkfK >>>>>>>iJJpsRUGawhg2Ub8s%3D&reserved=0: >>>>>> 8080/job/royale-typedefs/ws/js/target/downloads/svg.js> >>>>>>> >>>>>>> double-check-file: >>>>>>> [echo] ${env.ROYALE_DOWNLOAD_CACHE} >>>>>>> [echo] Need file: ${still_no_file} >>>>>>> >>>>>>> get-from-cache-if-needed: >>>>>>> >>>>>>> fail-if-not-found: >>>>>>> >>>>>>> preprocess: >>>>>>> [exec] error: corrupt patch at line 64 >>>>>>> >>>>>>> BUILD FAILED >>>>>>> >>>>>>><https://na01.safelinks.protection.outlook.com/?url=http%3A%2F%2Fapa >>>>>>>cheroyaleci.westus2.cloudapp.azure.com&data=02%7C01%7Caharui%40adobe >>>>>>>.com%7Ca91f37b4a59c41d2dead08d5723574f0%7Cfa7b1b5a7b34438794aed2c178 >>>>>>>decee1%7C0%7C0%7C636540496276826984&sdata=LL61UmzMw2XOCgf3qyF5QdqkfK >>>>>>>iJJpsRUGawhg2Ub8s%3D&reserved=0: >>>>>> 8080/job/royale-typedefs/ws/build.xml>:52: The following error >>>>>>occurred >>>>>> while executing this line: >>>>>>> >>>>>>><https://na01.safelinks.protection.outlook.com/?url=http%3A%2F%2Fapa >>>>>>>cheroyaleci.westus2.cloudapp.azure.com&data=02%7C01%7Caharui%40adobe >>>>>>>.com%7Ca91f37b4a59c41d2dead08d5723574f0%7Cfa7b1b5a7b34438794aed2c178 >>>>>>>decee1%7C0%7C0%7C636540496276826984&sdata=LL61UmzMw2XOCgf3qyF5QdqkfK >>>>>>>iJJpsRUGawhg2Ub8s%3D&reserved=0: >>>>>> 8080/job/royale-typedefs/ws/js/build.xml>:149: exec returned: 128 >>>>>>> >>>>>>> Total time: 2 seconds >>>>>>> Picked up JAVA_TOOL_OPTIONS: -Dfile.encoding=UTF-8 >>>>>>> Build step 'Invoke Ant' marked build as failure >>>>>> >>>>>> >>>>> >>>>> >>>>> -- >>>>> >>>>> Piotr Zarzycki >>>>> >>>>> Patreon: >>>>>*https://na01.safelinks.protection.outlook.com/?url=https%3A%2F%2Fwww. >>>>>patreon.com%2Fpiotrzarzycki&data=02%7C01%7Caharui%40adobe.com%7Ca91f37 >>>>>b4a59c41d2dead08d5723574f0%7Cfa7b1b5a7b34438794aed2c178decee1%7C0%7C0% >>>>>7C636540496276826984&sdata=2fD1juoozT2tkWvBX%2FcqAPDUTVAnsjHFqEb27EBgl >>>>>TU%3D&reserved=0 >>>>> >>>>><https://na01.safelinks.protection.outlook.com/?url=https%3A%2F%2Fwww. >>>>>patreon.com%2Fpiotrzarzycki&data=02%7C01%7Caharui%40adobe.com%7Ca91f37 >>>>>b4a59c41d2dead08d5723574f0%7Cfa7b1b5a7b34438794aed2c178decee1%7C0%7C0% >>>>>7C636540496276826984&sdata=2fD1juoozT2tkWvBX%2FcqAPDUTVAnsjHFqEb27EBgl >>>>>TU%3D&reserved=0>* >>>> >>>> >>> >>> >>> -- >>> >>> Piotr Zarzycki >>> >>> Patreon: >>>*https://na01.safelinks.protection.outlook.com/?url=https%3A%2F%2Fwww.pa >>>treon.com%2Fpiotrzarzycki&data=02%7C01%7Caharui%40adobe.com%7Ca91f37b4a5 >>>9c41d2dead08d5723574f0%7Cfa7b1b5a7b34438794aed2c178decee1%7C0%7C0%7C6365 >>>40496276826984&sdata=2fD1juoozT2tkWvBX%2FcqAPDUTVAnsjHFqEb27EBglTU%3D&re >>>served=0 >>> >>><https://na01.safelinks.protection.outlook.com/?url=https%3A%2F%2Fwww.pa >>>treon.com%2Fpiotrzarzycki&data=02%7C01%7Caharui%40adobe.com%7Ca91f37b4a5 >>>9c41d2dead08d5723574f0%7Cfa7b1b5a7b34438794aed2c178decee1%7C0%7C0%7C6365 >>>40496276826984&sdata=2fD1juoozT2tkWvBX%2FcqAPDUTVAnsjHFqEb27EBglTU%3D&re >>>served=0>* >>> >> >
