Re: svn commit: r1859876 - in /ofbiz/tools/demo-backup: Nicolas/functions.sh Nicolas/trunk.sh trunk.sh

[Jacques Le Roux]

Hi Nicolas,

So the idea is to remove also gradlew from OFBiz dir?

Jacques

Le 24/05/2019 à 15:44, [hidden email] a écrit :

> Author: nmalin
> Date: Fri May 24 13:44:11 2019
> New Revision: 1859876
>
> URL: http://svn.apache.org/viewvc?rev=1859876&view=rev
> Log:
> Improved: Call nit-gradle-wrapper.sh if gradlew not present
> To prepare commit issue :
>      Remove the Gradle wrapper from our release packages
>      and add a step to our build notes (OFBIZ-10145)
>
> Modified:
>      ofbiz/tools/demo-backup/Nicolas/functions.sh
>      ofbiz/tools/demo-backup/Nicolas/trunk.sh
>      ofbiz/tools/demo-backup/trunk.sh
>
> Modified: ofbiz/tools/demo-backup/Nicolas/functions.sh
> URL: http://svn.apache.org/viewvc/ofbiz/tools/demo-backup/Nicolas/functions.sh?rev=1859876&r1=1859875&r2=1859876&view=diff
> ==============================================================================
> --- ofbiz/tools/demo-backup/Nicolas/functions.sh (original)
> +++ ofbiz/tools/demo-backup/Nicolas/functions.sh Fri May 24 13:44:11 2019
> @@ -37,4 +37,11 @@ applyPatches () {
>       for i in $(ls $2); do
>           patch -p0 < $2/$i;
>       done
> +}
> +
> +#control if gradlew is present, otherwise init it before
> +checkGradlew () {
> +    if [ ! -r "$OFBIZ_DIR/gradlew" ]; then
> +        sh $OFBIZ_DIR/gradle/init-gradle-wrapper.sh
> +    fi
>   }
> \ No newline at end of file
>
> Modified: ofbiz/tools/demo-backup/Nicolas/trunk.sh
> URL: http://svn.apache.org/viewvc/ofbiz/tools/demo-backup/Nicolas/trunk.sh?rev=1859876&r1=1859875&r2=1859876&view=diff
> ==============================================================================
> --- ofbiz/tools/demo-backup/Nicolas/trunk.sh (original)
> +++ ofbiz/tools/demo-backup/Nicolas/trunk.sh Fri May 24 13:44:11 2019
> @@ -18,6 +18,8 @@ removeUneededFiles $OFBIZ_DIR
>  
>   applyPatches $OFBIZ_DIR ~/patch/trunk
>  
> +checkGradlew
> +
>   # run OFBiz
>   ./gradlew --no-daemon loadAll
>   ./gradlew --no-daemon svnInfoFooter
>
> Modified: ofbiz/tools/demo-backup/trunk.sh
> URL: http://svn.apache.org/viewvc/ofbiz/tools/demo-backup/trunk.sh?rev=1859876&r1=1859875&r2=1859876&view=diff
> ==============================================================================
> --- ofbiz/tools/demo-backup/trunk.sh (original)
> +++ ofbiz/tools/demo-backup/trunk.sh Fri May 24 13:44:11 2019
> @@ -4,6 +4,11 @@ cd /home/ofbizDemo/trunk
>   svn up
>   rm /home/ofbizDemo/trunk/framework/base/config/*.jks
>   rm /home/ofbizDemo/trunk/framework/base/config/jesse.properties
> +
> +if [ ! -r "$OFBIZ_DIR/gradlew" ]; then
> +    sh $OFBIZ_DIR/gradle/init-gradle-wrapper.sh
> +fi
> +
>   ./gradlew --no-daemon pullAllPluginsSource
>   ./gradlew --no-daemon terminateOfbiz
>   ./gradlew --no-daemon cleanAll
>
>
>

[Nicolas Malin-2]

hmm not, I just control that if we haven't gradlew we init it.

Your remark just alert me that I forget to set the gradlew on .ignore

Nicolas


On 30/05/2019 12:25, Jacques Le Roux wrote:

> Hi Nicolas,
>
> So the idea is to remove also gradlew from OFBiz dir?
>
> Jacques
>
> Le 24/05/2019 à 15:44, [hidden email] a écrit :
>> Author: nmalin
>> Date: Fri May 24 13:44:11 2019
>> New Revision: 1859876
>>
>> URL: http://svn.apache.org/viewvc?rev=1859876&view=rev
>> Log:
>> Improved: Call nit-gradle-wrapper.sh if gradlew not present
>> To prepare commit issue :
>>      Remove the Gradle wrapper from our release packages
>>      and add a step to our build notes (OFBIZ-10145)
>>
>> Modified:
>>      ofbiz/tools/demo-backup/Nicolas/functions.sh
>>      ofbiz/tools/demo-backup/Nicolas/trunk.sh
>>      ofbiz/tools/demo-backup/trunk.sh
>>
>> Modified: ofbiz/tools/demo-backup/Nicolas/functions.sh
>> URL:
>> http://svn.apache.org/viewvc/ofbiz/tools/demo-backup/Nicolas/functions.sh?rev=1859876&r1=1859875&r2=1859876&view=diff
>> ==============================================================================
>>
>> --- ofbiz/tools/demo-backup/Nicolas/functions.sh (original)
>> +++ ofbiz/tools/demo-backup/Nicolas/functions.sh Fri May 24 13:44:11
>> 2019
>> @@ -37,4 +37,11 @@ applyPatches () {
>>       for i in $(ls $2); do
>>           patch -p0 < $2/$i;
>>       done
>> +}
>> +
>> +#control if gradlew is present, otherwise init it before
>> +checkGradlew () {
>> +    if [ ! -r "$OFBIZ_DIR/gradlew" ]; then
>> +        sh $OFBIZ_DIR/gradle/init-gradle-wrapper.sh
>> +    fi
>>   }
>> \ No newline at end of file
>>
>> Modified: ofbiz/tools/demo-backup/Nicolas/trunk.sh
>> URL:
>> http://svn.apache.org/viewvc/ofbiz/tools/demo-backup/Nicolas/trunk.sh?rev=1859876&r1=1859875&r2=1859876&view=diff
>> ==============================================================================
>>
>> --- ofbiz/tools/demo-backup/Nicolas/trunk.sh (original)
>> +++ ofbiz/tools/demo-backup/Nicolas/trunk.sh Fri May 24 13:44:11 2019
>> @@ -18,6 +18,8 @@ removeUneededFiles $OFBIZ_DIR
>>     applyPatches $OFBIZ_DIR ~/patch/trunk
>>   +checkGradlew
>> +
>>   # run OFBiz
>>   ./gradlew --no-daemon loadAll
>>   ./gradlew --no-daemon svnInfoFooter
>>
>> Modified: ofbiz/tools/demo-backup/trunk.sh
>> URL:
>> http://svn.apache.org/viewvc/ofbiz/tools/demo-backup/trunk.sh?rev=1859876&r1=1859875&r2=1859876&view=diff
>> ==============================================================================
>>
>> --- ofbiz/tools/demo-backup/trunk.sh (original)
>> +++ ofbiz/tools/demo-backup/trunk.sh Fri May 24 13:44:11 2019
>> @@ -4,6 +4,11 @@ cd /home/ofbizDemo/trunk
>>   svn up
>>   rm /home/ofbizDemo/trunk/framework/base/config/*.jks
>>   rm /home/ofbizDemo/trunk/framework/base/config/jesse.properties
>> +
>> +if [ ! -r "$OFBIZ_DIR/gradlew" ]; then
>> +    sh $OFBIZ_DIR/gradle/init-gradle-wrapper.sh
>> +fi
>> +
>>   ./gradlew --no-daemon pullAllPluginsSource
>>   ./gradlew --no-daemon terminateOfbiz
>>   ./gradlew --no-daemon cleanAll
>>
>>
>>
>

[Mathieu Lirzin]

Hello Nicolas,

Nicolas Malin <[hidden email]> writes:

> hmm not, I just control that if we haven't gradlew we init it.
>
> Your remark just alert me that I forget to set the gradlew on .ignore

I am confused. Are you proposing to add "gradlew" in the “./gitignore”
and “./hgignore” files in the framework repository? If not what is
“.ignore”?

Thanks.

--
Mathieu Lirzin
GPG: F2A3 8D7E EB2B 6640 5761  070D 0ADE E100 9460 4D37

[Jacques Le Roux]

But since gradlew is our own and will not be remobed then why testing?

    if [ ! -r "$OFBIZ_DIR/gradlew" ]; then

Jacques

Le 30/05/2019 à 12:47, Nicolas Malin a écrit :

> hmm not, I just control that if we haven't gradlew we init it.
>
> Your remark just alert me that I forget to set the gradlew on .ignore
>
> Nicolas
>
>
> On 30/05/2019 12:25, Jacques Le Roux wrote:
>> Hi Nicolas,
>>
>> So the idea is to remove also gradlew from OFBiz dir?
>>
>> Jacques
>>
>> Le 24/05/2019 à 15:44, [hidden email] a écrit :
>>> Author: nmalin
>>> Date: Fri May 24 13:44:11 2019
>>> New Revision: 1859876
>>>
>>> URL: http://svn.apache.org/viewvc?rev=1859876&view=rev
>>> Log:
>>> Improved: Call nit-gradle-wrapper.sh if gradlew not present
>>> To prepare commit issue :
>>>      Remove the Gradle wrapper from our release packages
>>>      and add a step to our build notes (OFBIZ-10145)
>>>
>>> Modified:
>>>      ofbiz/tools/demo-backup/Nicolas/functions.sh
>>>      ofbiz/tools/demo-backup/Nicolas/trunk.sh
>>>      ofbiz/tools/demo-backup/trunk.sh
>>>
>>> Modified: ofbiz/tools/demo-backup/Nicolas/functions.sh
>>> URL: http://svn.apache.org/viewvc/ofbiz/tools/demo-backup/Nicolas/functions.sh?rev=1859876&r1=1859875&r2=1859876&view=diff
>>> ==============================================================================
>>> --- ofbiz/tools/demo-backup/Nicolas/functions.sh (original)
>>> +++ ofbiz/tools/demo-backup/Nicolas/functions.sh Fri May 24 13:44:11 2019
>>> @@ -37,4 +37,11 @@ applyPatches () {
>>>       for i in $(ls $2); do
>>>           patch -p0 < $2/$i;
>>>       done
>>> +}
>>> +
>>> +#control if gradlew is present, otherwise init it before
>>> +checkGradlew () {
>>> +    if [ ! -r "$OFBIZ_DIR/gradlew" ]; then
>>> +        sh $OFBIZ_DIR/gradle/init-gradle-wrapper.sh
>>> +    fi
>>>   }
>>> \ No newline at end of file
>>>
>>> Modified: ofbiz/tools/demo-backup/Nicolas/trunk.sh
>>> URL: http://svn.apache.org/viewvc/ofbiz/tools/demo-backup/Nicolas/trunk.sh?rev=1859876&r1=1859875&r2=1859876&view=diff
>>> ==============================================================================
>>> --- ofbiz/tools/demo-backup/Nicolas/trunk.sh (original)
>>> +++ ofbiz/tools/demo-backup/Nicolas/trunk.sh Fri May 24 13:44:11 2019
>>> @@ -18,6 +18,8 @@ removeUneededFiles $OFBIZ_DIR
>>>     applyPatches $OFBIZ_DIR ~/patch/trunk
>>>   +checkGradlew
>>> +
>>>   # run OFBiz
>>>   ./gradlew --no-daemon loadAll
>>>   ./gradlew --no-daemon svnInfoFooter
>>>
>>> Modified: ofbiz/tools/demo-backup/trunk.sh
>>> URL: http://svn.apache.org/viewvc/ofbiz/tools/demo-backup/trunk.sh?rev=1859876&r1=1859875&r2=1859876&view=diff
>>> ==============================================================================
>>> --- ofbiz/tools/demo-backup/trunk.sh (original)
>>> +++ ofbiz/tools/demo-backup/trunk.sh Fri May 24 13:44:11 2019
>>> @@ -4,6 +4,11 @@ cd /home/ofbizDemo/trunk
>>>   svn up
>>>   rm /home/ofbizDemo/trunk/framework/base/config/*.jks
>>>   rm /home/ofbizDemo/trunk/framework/base/config/jesse.properties
>>> +
>>> +if [ ! -r "$OFBIZ_DIR/gradlew" ]; then
>>> +    sh $OFBIZ_DIR/gradle/init-gradle-wrapper.sh
>>> +fi
>>> +
>>>   ./gradlew --no-daemon pullAllPluginsSource
>>>   ./gradlew --no-daemon terminateOfbiz
>>>   ./gradlew --no-daemon cleanAll
>>>
>>>
>>>
>>
>

[Nicolas Malin-2]

On 30/05/2019 13:04, Mathieu Lirzin wrote:

> Hello Nicolas,
>
> Nicolas Malin <[hidden email]> writes:
>
>> hmm not, I just control that if we haven't gradlew we init it.
>>
>> Your remark just alert me that I forget to set the gradlew on .ignore
> I am confused. Are you proposing to add "gradlew" in the “./gitignore”
> and “./hgignore” files in the framework repository? If not what is
> “.ignore”?

Tu pinalles Maurice :)

You right, the better syntax would be ./*ignore so yes complete
./gitignore and ./hgignore

Nicolas

>
> Thanks.
>

[Mathieu Lirzin]

Nicolas Malin <[hidden email]> writes:

> On 30/05/2019 13:04, Mathieu Lirzin wrote:
>
>> Nicolas Malin <[hidden email]> writes:
>>
>>> hmm not, I just control that if we haven't gradlew we init it.
>>>
>>> Your remark just alert me that I forget to set the gradlew on .ignore
>> I am confused. Are you proposing to add "gradlew" in the “./gitignore”
>> and “./hgignore” files in the framework repository? If not what is
>> “.ignore”?
>
> Tu pinalles Maurice :)
>
> You right, the better syntax would be ./*ignore so yes complete
> ./gitignore and ./hgignore

I wasn't nitpicking on your spelling, I was just checking that I was I
was understanding you correctly before disagreeing. :-)

IMO “./gradlew” should definitely be kept in our Version Controlled
System (VCS) in order to follow Gradle recommendations and avoid
specific build instructions.

The requirement of not distributing “gradle-wrapper.jar” in OFBiz
releases should only impact the build process of the release archives
and *not* the build process of the VCS branches.

--
Mathieu Lirzin
GPG: F2A3 8D7E EB2B 6640 5761  070D 0ADE E100 9460 4D37

[Jacques Le Roux]

+1 pour Maurice (as my question was wondering)

Jacques

Le 31/05/2019 à 00:02, Mathieu Lirzin a écrit :

> Nicolas Malin <[hidden email]> writes:
>
>> On 30/05/2019 13:04, Mathieu Lirzin wrote:
>>
>>> Nicolas Malin <[hidden email]> writes:
>>>
>>>> hmm not, I just control that if we haven't gradlew we init it.
>>>>
>>>> Your remark just alert me that I forget to set the gradlew on .ignore
>>> I am confused. Are you proposing to add "gradlew" in the “./gitignore”
>>> and “./hgignore” files in the framework repository? If not what is
>>> “.ignore”?
>> Tu pinalles Maurice :)
>>
>> You right, the better syntax would be ./*ignore so yes complete
>> ./gitignore and ./hgignore
> I wasn't nitpicking on your spelling, I was just checking that I was I
> was understanding you correctly before disagreeing. :-)
>
> IMO “./gradlew” should definitely be kept in our Version Controlled
> System (VCS) in order to follow Gradle recommendations and avoid
> specific build instructions.
>
> The requirement of not distributing “gradle-wrapper.jar” in OFBiz
> releases should only impact the build process of the release archives
> and *not* the build process of the VCS branches.
>

[Nicolas Malin-2]

Ok, I understand now :)

I take a wrong way to focus on gradlew as immutable file.

I proposed a patch on OFBIZ-10145 [1] [2] to update it and keep the same
build process.

Nicolas

[1] https://issues.apache.org/jira/browse/OFBIZ-10145

[2]
https://issues.apache.org/jira/secure/attachment/12970646/OFBIZ-10145-gradlew.patch

On 31/05/2019 08:59, Jacques Le Roux wrote:

> +1 pour Maurice (as my question was wondering)
>
> Jacques
>
> Le 31/05/2019 à 00:02, Mathieu Lirzin a écrit :
>> Nicolas Malin <[hidden email]> writes:
>>
>>> On 30/05/2019 13:04, Mathieu Lirzin wrote:
>>>
>>>> Nicolas Malin <[hidden email]> writes:
>>>>
>>>>> hmm not, I just control that if we haven't gradlew we init it.
>>>>>
>>>>> Your remark just alert me that I forget to set the gradlew on .ignore
>>>> I am confused. Are you proposing to add "gradlew" in the “./gitignore”
>>>> and “./hgignore” files in the framework repository? If not what is
>>>> “.ignore”?
>>> Tu pinalles Maurice :)
>>>
>>> You right, the better syntax would be ./*ignore so yes complete
>>> ./gitignore and ./hgignore
>> I wasn't nitpicking on your spelling, I was just checking that I was I
>> was understanding you correctly before disagreeing. :-)
>>
>> IMO “./gradlew” should definitely be kept in our Version Controlled
>> System (VCS) in order to follow Gradle recommendations and avoid
>> specific build instructions.
>>
>> The requirement of not distributing “gradle-wrapper.jar” in OFBiz
>> releases should only impact the build process of the release archives
>> and *not* the build process of the VCS branches.
>>
>

---------------------------------------------------------------------
To unsubscribe, e-mail: [hidden email]
For additional commands, e-mail: [hidden email]