Skip to content
This repository has been archived by the owner on Apr 30, 2024. It is now read-only.

Commit

Permalink
Ignore whitespace changes when comparing java includes
Browse files Browse the repository at this point in the history 
The Adoptium JDKs have some whitespace differences between
different platforms
  • Loading branch information
@jonahgraham
jonahgraham committed Jul 20, 2022
1 parent 7c2b745 commit 8096da4
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions docker/cdt-infra-base/ubuntu-18.04/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -96,8 +96,8 @@ RUN export JVERSION=${JDK8_VERSION} \
&& curl -sL "https://api.adoptium.net/v3/binary/version/${JVERSION}/mac/x64/jdk/hotspot/normal/eclipse?project=jdk" > /tmp/x/openjdk-mac.tar.gz \
&& mkdir /tmp/x/win32 && cd /tmp/x/win32 && unzip /tmp/x/openjdk-win32.zip \
&& mkdir /tmp/x/mac && cd /tmp/x/mac && tar xvf /tmp/x/openjdk-mac.tar.gz \
&& cd $JHOME/include && for i in *.h; do diff $i /tmp/x/win32/${JVERSION}/include/$i ; done \
&& cd $JHOME/include && for i in *.h; do diff $i /tmp/x/mac/${JVERSION}/Contents/Home/include/$i ; done \
&& cd $JHOME/include && for i in *.h; do diff -w $i /tmp/x/win32/${JVERSION}/include/$i ; done \
&& cd $JHOME/include && for i in *.h; do diff -w $i /tmp/x/mac/${JVERSION}/Contents/Home/include/$i ; done \
&& mv /tmp/x/win32/${JVERSION}/include/win32 $JHOME/include \
&& mv /tmp/x/mac/${JVERSION}/Contents/Home/include/darwin $JHOME/include \
&& find $JHOME/include \
Expand All @@ -112,8 +112,8 @@ RUN export JVERSION=${JDK11_VERSION} \
&& curl -sL "https://api.adoptium.net/v3/binary/version/${JVERSION}/mac/x64/jdk/hotspot/normal/eclipse?project=jdk" > /tmp/x/openjdk-mac.tar.gz \
&& mkdir /tmp/x/win32 && cd /tmp/x/win32 && unzip /tmp/x/openjdk-win32.zip \
&& mkdir /tmp/x/mac && cd /tmp/x/mac && tar xvf /tmp/x/openjdk-mac.tar.gz \
&& cd $JHOME/include && for i in *.h; do diff $i /tmp/x/win32/${JVERSION}/include/$i ; done \
&& cd $JHOME/include && for i in *.h; do diff $i /tmp/x/mac/${JVERSION}/Contents/Home/include/$i ; done \
&& cd $JHOME/include && for i in *.h; do diff -w $i /tmp/x/win32/${JVERSION}/include/$i ; done \
&& cd $JHOME/include && for i in *.h; do diff -w $i /tmp/x/mac/${JVERSION}/Contents/Home/include/$i ; done \
&& mv /tmp/x/win32/${JVERSION}/include/win32 $JHOME/include \
&& mv /tmp/x/mac/${JVERSION}/Contents/Home/include/darwin $JHOME/include \
&& find $JHOME/include \
Expand All @@ -128,8 +128,8 @@ RUN export JVERSION=${JDK17_VERSION} \
&& curl -sL "https://api.adoptium.net/v3/binary/version/${JVERSION}/mac/x64/jdk/hotspot/normal/eclipse?project=jdk" > /tmp/x/openjdk-mac.tar.gz \
&& mkdir /tmp/x/win32 && cd /tmp/x/win32 && unzip /tmp/x/openjdk-win32.zip \
&& mkdir /tmp/x/mac && cd /tmp/x/mac && tar xvf /tmp/x/openjdk-mac.tar.gz \
&& cd $JHOME/include && for i in *.h; do diff $i /tmp/x/win32/${JVERSION}/include/$i ; done \
&& cd $JHOME/include && for i in *.h; do diff $i /tmp/x/mac/${JVERSION}/Contents/Home/include/$i ; done \
&& cd $JHOME/include && for i in *.h; do diff -w $i /tmp/x/win32/${JVERSION}/include/$i ; done \
&& cd $JHOME/include && for i in *.h; do diff -w $i /tmp/x/mac/${JVERSION}/Contents/Home/include/$i ; done \
&& mv /tmp/x/win32/${JVERSION}/include/win32 $JHOME/include \
&& mv /tmp/x/mac/${JVERSION}/Contents/Home/include/darwin $JHOME/include \
&& find $JHOME/include \
Expand Down

0 comments on commit 8096da4

Please sign in to comment.