[Laszlo-checkins] r10186 - openlaszlo/trunk/WEB-INF/lps/server/bin

[dda@openlaszlo.org]

Author: dda
Date: 2008-07-02 19:52:26 -0700 (Wed, 02 Jul 2008)
New Revision: 10186

Modified:
   openlaszlo/trunk/WEB-INF/lps/server/bin/convert_required.pl
Log:
Change 20080702-dda-H by dda at lester.local on 2008-07-02 22:12:02 EDT
    in /Users/dda/laszlo/src/svn/openlaszlo/trunk-a
    for http://svn.openlaszlo.org/openlaszlo/trunk

Summary: Fix newline behavior for conversion script

New Features:

Bugs Fixed: LPP-6584

Technical Reviewer: (pending)
QA Reviewer: promanik (pending)
Doc Reviewer: (pending)

Documentation:

Release Notes:

Details:
    If the file ends without a newline, the converted
    script should not add a newline.

Tests:
    Tried simple test cases ending with, and without a newline.



Modified: openlaszlo/trunk/WEB-INF/lps/server/bin/convert_required.pl
===================================================================
--- openlaszlo/trunk/WEB-INF/lps/server/bin/convert_required.pl	2008-07-03 02:13:52 UTC (rev 10185)
+++ openlaszlo/trunk/WEB-INF/lps/server/bin/convert_required.pl	2008-07-03 02:52:26 UTC (rev 10186)
@@ -302,13 +302,14 @@
     my $save = $_;
     my $FH = $_[0];
     $_ = $_[1];
+    my $hadnewline = ($_ =~ "\n");
 
     &convert_class_name_changes();
     &convert_new_instanceof();
 
     # After matching, the newline may be lost.
     # Add it again here so everything comes out even.
-    if ($_ !~ "\n") {
+    if ($_ !~ "\n" && "$hadnewline" == 1) {
         $_ .= "\n";
     }