Apache
/
lucene
mirror of https://github.com/apache/lucene.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
This commit is contained in:
Uwe Schindler 2012-07-09 16:50:25 +00:00
parent d4522d1016
commit 2f123d1209
4 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lucene/analysis/common/build.xml
View File

@ -61,6 +61,7 @@
executable="${python.exe}" failonerror="true" logerror="true"> executable="${python.exe}" failonerror="true" logerror="true">
<arg value="htmlentity.py"/> <arg value="htmlentity.py"/>
</exec> </exec>
<fixcrlf file="src/java/org/apache/lucene/analysis/charfilter/HTMLCharacterEntities.jflex" encoding="UTF-8"/>
</target> </target>
<target name="jflex-wiki-tokenizer" depends="init,jflex-check" if="jflex.present"> <target name="jflex-wiki-tokenizer" depends="init,jflex-check" if="jflex.present">

2
lucene/analysis/common/src/java/org/apache/lucene/analysis/charfilter/HTMLStripCharFilter.jflex
View File

@ -1,6 +1,6 @@
package org.apache.lucene.analysis.charfilter; package org.apache.lucene.analysis.charfilter;
/** /*
* Licensed to the Apache Software Foundation (ASF) under one or more * Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with * contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership. * this work for additional information regarding copyright ownership.

1
lucene/core/build.xml
View File

@ -68,6 +68,7 @@
executable="${python.exe}" failonerror="true"> executable="${python.exe}" failonerror="true">
<arg line="createLevAutomata.py @{n} False"/> <arg line="createLevAutomata.py @{n} False"/>
</exec> </exec>
<fixcrlf srcdir="src/java/org/apache/lucene/util/automaton" includes="*ParametricDescription.java" encoding="UTF-8"/>
</sequential> </sequential>
</macrodef> </macrodef>

2
lucene/core/src/java/org/apache/lucene/util/automaton/createLevAutomata.py
View File

@ -121,7 +121,7 @@ def main():
w('package org.apache.lucene.util.automaton;') w('package org.apache.lucene.util.automaton;')
w('') w('')
w('/**') w('/*')
w(' * Licensed to the Apache Software Foundation (ASF) under one or more') w(' * Licensed to the Apache Software Foundation (ASF) under one or more')
w(' * contributor license agreements. See the NOTICE file distributed with') w(' * contributor license agreements. See the NOTICE file distributed with')
w(' * this work for additional information regarding copyright ownership.') w(' * this work for additional information regarding copyright ownership.')