From 2f123d1209673dbca335bd0264435f73c21d7520 Mon Sep 17 00:00:00 2001
From: Uwe Schindler <uschindler@apache.org>
Date: Mon, 9 Jul 2012 16:50:25 +0000
Subject: [PATCH] Fix CRLF problem with running python on windows /and/or
 cygwin when creating java source files. Also fix broken generated license
 header.

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1359275 13f79535-47bb-0310-9956-ffa450edef68
---
 lucene/analysis/common/build.xml                                | 1 +
 .../apache/lucene/analysis/charfilter/HTMLStripCharFilter.jflex | 2 +-
 lucene/core/build.xml                                           | 1 +
 .../java/org/apache/lucene/util/automaton/createLevAutomata.py  | 2 +-
 4 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/lucene/analysis/common/build.xml b/lucene/analysis/common/build.xml
index b789b258b09..dadf374bc14 100644
--- a/lucene/analysis/common/build.xml
+++ b/lucene/analysis/common/build.xml
@@ -61,6 +61,7 @@
           executable="${python.exe}" failonerror="true" logerror="true">
       <arg value="htmlentity.py"/>
     </exec>
+    <fixcrlf file="src/java/org/apache/lucene/analysis/charfilter/HTMLCharacterEntities.jflex" encoding="UTF-8"/>
   </target>
 
   <target name="jflex-wiki-tokenizer" depends="init,jflex-check" if="jflex.present">
diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/charfilter/HTMLStripCharFilter.jflex b/lucene/analysis/common/src/java/org/apache/lucene/analysis/charfilter/HTMLStripCharFilter.jflex
index 3c9116b8440..3e384b10068 100755
--- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/charfilter/HTMLStripCharFilter.jflex
+++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/charfilter/HTMLStripCharFilter.jflex
@@ -1,6 +1,6 @@
 package org.apache.lucene.analysis.charfilter;
 
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.
diff --git a/lucene/core/build.xml b/lucene/core/build.xml
index e5d7f1de170..bf60a895bd8 100644
--- a/lucene/core/build.xml
+++ b/lucene/core/build.xml
@@ -68,6 +68,7 @@
             executable="${python.exe}" failonerror="true">
         <arg line="createLevAutomata.py @{n} False"/>
       </exec>
+      <fixcrlf srcdir="src/java/org/apache/lucene/util/automaton" includes="*ParametricDescription.java" encoding="UTF-8"/>
     </sequential>
   </macrodef>
 
diff --git a/lucene/core/src/java/org/apache/lucene/util/automaton/createLevAutomata.py b/lucene/core/src/java/org/apache/lucene/util/automaton/createLevAutomata.py
index 453daffd657..982421e236c 100644
--- a/lucene/core/src/java/org/apache/lucene/util/automaton/createLevAutomata.py
+++ b/lucene/core/src/java/org/apache/lucene/util/automaton/createLevAutomata.py
@@ -121,7 +121,7 @@ def main():
 
   w('package org.apache.lucene.util.automaton;')
   w('')
-  w('/**')
+  w('/*')
   w(' * Licensed to the Apache Software Foundation (ASF) under one or more')
   w(' * contributor license agreements.  See the NOTICE file distributed with')
   w(' * this work for additional information regarding copyright ownership.')