[Building Sakai] Sakai Patch Problem Under Windows Environment

[Steve Swinsburg]

I knew Matt would jump in :)

It worked except for the first section:

Hunk #1 FAILED at 127.
1 out of 1 hunk FAILED -- saving rejects to file samigo-api/src/java/xml/xsl/dat
aTransform/import/v1p2/extractItem.xsl.rej

You'll need to open rejects to file samigo-api/src/java/xml/xsl/dataTransform/import/v1p2/extractItem.xsl.rej and rejects to file samigo-api/src/java/xml/xsl/dataTransform/import/v1p2/extractItem.xsl. and manually resolve it.

cheers,
Steve




On 23/07/2010, at 11:28 PM, Jigar Joshi wrote:

> It worked with 1st option and running from samigo directory.
> 
> i got output as follows. is it done , let me confirm.
> 
> C:\Documents and Settings\argus\My Documents\NetBeansProjects\Sakai\sakai-src-2.
> 7.0\Samigo>patch -p0  < d:\samlite.patch
> patching file samigo-api/src/java/xml/xsl/dataTransform/import/v1p2/extractItem.
> xsl
> Hunk #1 FAILED at 127.
> 1 out of 1 hunk FAILED -- saving rejects to file samigo-api/src/java/xml/xsl/dat
> aTransform/import/v1p2/extractItem.xsl.rej
> patching file samigo-services/src/java/org/sakaiproject/tool/assessment/facade/A
> ssessmentFacadeQueriesAPI.java
> patching file samigo-services/src/java/org/sakaiproject/tool/assessment/facade/A
> ssessmentFacadeQueries.java
> patching file samigo-services/src/java/org/sakaiproject/tool/assessment/services
> /assessment/AssessmentService.java
> patching file samigo-qti/src/java/org/sakaiproject/tool/assessment/services/qti/
> QTIService.java
> Hunk #1 succeeded at 70 (offset 3 lines).
> patching file samigo-qti/src/java/org/sakaiproject/tool/assessment/qti/helper/Au
> thoringHelper.java
> Hunk #1 succeeded at 494 with fuzz 2 (offset 21 lines).
> Hunk #2 succeeded at 516 with fuzz 2 (offset 21 lines).
> 
> C:\Documents and Settings\argus\My Documents\NetBeansProjects\Sakai\sakai-src-2.
> 
> 
> 
> On Fri, Jul 23, 2010 at 6:21 PM, Matthew Jones <jonespm at umich.edu> wrote:
> This is because of unix (LF) line endings, most of the windows patch programs have a problem with them. [1] 
> 
> You can either:
> 1) "Open the file with WORDPAD, choose "Save as" and select as type Text document."
> 2) Use this dos command, filling in the new and old file names (I think they have to be different): [2] 
> 
> TYPE unix_file | FIND "" /V > dos_file
> [1] http://drupal.org/node/60116
> [2] http://en.wikipedia.org/wiki/Line_endings#Conversion_utilities
> 
> On Fri, Jul 23, 2010 at 3:42 AM, Jigar Joshi <jigarjm at gmail.com> wrote:
> Well just to try i have applied from samigo directory also,
> but it shows
> 
> 7.0\Samigo>patch -p0  < d:\samlite.patch
> patching file samigo-api/src/java/xml/xsl/dataTransform/import/v1p2/extractItem.
> xsl
> Assertion failed: hunk, file ../patch-2.5.9-src/patch.c, line 354
> 
> This application has requested the Runtime to terminate it in an unusual way.
> Please contact the application's support team for more information.
> 
> 
> On Fri, Jul 23, 2010 at 4:26 AM, Steve Swinsburg <steve.swinsburg at gmail.com> wrote:
> Jigar, as discussed off-list, this particular patch needs to be applied from *within* the samigo source directory. If you open the patch file you'll see on the first line where it will be applied from. 
> 
> It patches fine for me with a 2.7 samigo checkout on a Mac, I believe the issue is in the Windows patch command.
> 
> cheers,
> Steve
> 
> 
> 
> 
> On 23/07/2010, at 4:12 AM, Karen Tsao wrote:
> 
>> I think you patch from the wrong directory. Can you go into sam and try again?
>> 
>> Thanks,
>> Karen
>> 
>> On Thu, Jul 22, 2010 at 6:11 AM, Jigar Joshi <jigarjm at gmail.com> wrote:
>> I have downloaded the code of sakai from http://source.sakaiproject.org/release/2.7.0/artifacts/sakai-src-2.7.0.zip 
>> 
>> which didn't contain samigo directory. as per instruction i have checked out the code of samigo from https://source.sakaiproject.org/svn/sam/trunk
>> 
>> and then moved the checked out code in to the sakai directory so it is  now
>> 
>> sakai
>> |
>> |- samigo
>> |-
>> |-
>> 
>> now i am executing patch -p0  < d:\samlite.patch from sakai directory and the patch file you have just sent is located in D:\
>> the patch file is attached here.
>> 
>> and the output i am getting is 
>> 
>> C:\Documents and Settings\argus\My Documents\NetBeansProjects\Sakai\sakai-src-2.
>> 7.0>patch -p0  < d:\samlite.patch
>> can't find file to patch at input line 5
>> Perhaps you used the wrong -p or --strip option?
>> The text leading up to this was:
>> --------------------------
>> |Index: samigo-api/src/java/xml/xsl/dataTransform/import/v1p2/extractItem.xsl
>> |===================================================================
>> |--- samigo-api/src/java/xml/xsl/dataTransform/import/v1p2/extractItem.xsl
>> (revision 399)
>> |+++ samigo-api/src/java/xml/xsl/dataTransform/import/v1p2/extractItem.xsl
>> (revision 400)
>> --------------------------
>> File to patch:
>> 
>> 
>> 
>> Will you please correct me i want to apply this patch.
>> It works file under mac env.
>> 
>> 
>> -- 
>> Regards
>> Jigar
>> Programmer Analyst.
>>  
>> 
>> 
>> _______________________________________________
>> sakai-dev mailing list
>> sakai-dev at collab.sakaiproject.org
>> http://collab.sakaiproject.org/mailman/listinfo/sakai-dev
>> 
>> TO UNSUBSCRIBE: send email to sakai-dev-unsubscribe at collab.sakaiproject.org with a subject of "unsubscribe"
>> 
>> _______________________________________________
>> sakai-dev mailing list
>> sakai-dev at collab.sakaiproject.org
>> http://collab.sakaiproject.org/mailman/listinfo/sakai-dev
>> 
>> TO UNSUBSCRIBE: send email to sakai-dev-unsubscribe at collab.sakaiproject.org with a subject of "unsubscribe"
> 
> 
> 
> 
> -- 
> Regards
> Jigar
> Programmer Analyst.
>  
> 
> 
> _______________________________________________
> sakai-dev mailing list
> sakai-dev at collab.sakaiproject.org
> http://collab.sakaiproject.org/mailman/listinfo/sakai-dev
> 
> TO UNSUBSCRIBE: send email to sakai-dev-unsubscribe at collab.sakaiproject.org with a subject of "unsubscribe"
> 
> 
> 
> 
> -- 
> Regards
> Jigar
> Programmer Analyst.
>  
> 

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://collab.sakaiproject.org/pipermail/sakai-dev/attachments/20100724/65cdd189/attachment.html