Skip to content

Commit

Permalink
Bug 1614314 - Use GitHub as upstream for the Java code of the HTML pa…
Browse files Browse the repository at this point in the history
…rser. r=alchen

Differential Revision: https://phabricator.services.mozilla.com/D62238

--HG--
extra : moz-landing-system : lando
  • Loading branch information
hsivonen committed Feb 10, 2020
1 parent c343055 commit 3ad0a42
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 9 deletions.
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,8 @@ js/src/tests/results-*.txt
# Java HTML5 parser classes
parser/html/java/htmlparser/
parser/html/java/javaparser/
parser/html/java/javaparser.jar
parser/html/java/translator.jar

# Ignore the files and directory that Eclipse IDE creates
.project
Expand Down
9 changes: 5 additions & 4 deletions parser/html/java/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,11 @@ sync_javaparser:: \

sync_htmlparser:: \
; if [ -d htmlparser/.hg ] ; \
then cd htmlparser ; hg pull --rebase ; cd .. ; \
else \
rm -rf htmlparser ; \
hg clone https://hg.mozilla.org/projects/htmlparser ; \
then echo "The htmlparser repo has move to GitHub. Please remove the htmlparser directory and resync." ; exit ; \
elif [ ! -d htmlparser/.git ] ; \
then rm -rf htmlparser ; \
git clone https://github.com/validator/htmlparser.git ; \
cd htmlparser ; git checkout master ; cd .. ; \
fi

sync:: sync_javaparser sync_htmlparser
Expand Down
9 changes: 4 additions & 5 deletions parser/html/java/README.txt
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,7 @@ repository by retyping 'make translate' in this directory.
The makefile supports the following targets:

sync_htmlparser:
Retrieves the HTML parser and Java to C++ translator sources from Mozilla's
htmlparser repository.
Retrieves the HTML parser and Java to C++ translator sources from GitHub.
sync_javaparser:
Retrieves the javaparser sources from GitHub.
sync:
Expand Down Expand Up @@ -47,7 +46,7 @@ clean:
# starting from the root of a mozilla-central checkout
cd parser/html/java/
make sync
# now you have a clone of https://hg.mozilla.org/projects/htmlparser/ in parser/html/java/htmlparser/
# now you have a clone of https://github.com/validator/htmlparser/tree/master in parser/html/java/htmlparser/
cd htmlparser/src/
$EDITOR nu/validator/htmlparser/impl/AttributeName.java
# Search for the word "uncomment" and uncomment stuff according to the comments that talk about uncommenting
Expand All @@ -71,7 +70,7 @@ cd ../../..
# Then, starting from the root of a mozilla-central checkout
cd parser/html/java/
make sync
# now you have a clone of https://hg.mozilla.org/projects/htmlparser/ in parser/html/java/htmlparser/
# now you have a clone of https://github.com/validator/htmlparser/tree/master in parser/html/java/htmlparser/
cd htmlparser/src/
$EDITOR nu/validator/htmlparser/impl/ElementName.java
# Search for the word "uncomment" and uncomment stuff according to the comments that talk about uncommenting
Expand All @@ -90,4 +89,4 @@ cd ../../..
./mach clang-format

Ben Newman (23 September 2009)
Henri Sivonen (10 August 2017)
Henri Sivonen (10 August 2017, 10 February 2020)

0 comments on commit 3ad0a42

Please sign in to comment.