From da537415e89546eab6b9e03ced392e83e34661aa Mon Sep 17 00:00:00 2001 From: "Taro L. Saito" Date: Wed, 6 Apr 2011 23:33:32 +0900 Subject: [PATCH] Fix newlines --- Makefile | 160 +++++++++--------- .../snappy/native/Linux/amd64/libsnappy.so | Bin 51784 -> 51784 bytes 2 files changed, 80 insertions(+), 80 deletions(-) mode change 100755 => 100644 Makefile diff --git a/Makefile b/Makefile old mode 100755 new mode 100644 index 1b2e5bc..5e1f53f --- a/Makefile +++ b/Makefile @@ -1,80 +1,80 @@ - -include Makefile.common - -MVN:=mvn - -all: snappy - -SNAPPY_OUT:=$(TARGET)/$(snappy)-$(os_arch) -SNAPPY_ARCHIVE:=$(TARGET)/snappy-$(VERSION).tar.gz -SNAPPY_CC:=snappy-sinksource.cc snappy-stubs-internal.cc snappy.cc -SNAPPY_SRC_DIR:=$(TARGET)/snappy-$(VERSION) -SNAPPY_SRC:=$(addprefix $(SNAPPY_SRC_DIR)/,$(SNAPPY_CC)) -SNAPPY_OBJ:=$(addprefix $(SNAPPY_OUT)/,$(patsubst %.cc,%.o,$(SNAPPY_CC)) SnappyNative.o) - -SNAPPY_UNPACKED:=$(TARGET)/snappy-extracted.log - -CXXFLAGS:=$(CXXFLAGS) -I$(SNAPPY_SRC_DIR) - -$(SNAPPY_ARCHIVE): - @mkdir -p $(@D) - curl -o$@ http://snappy.googlecode.com/files/snappy-$(VERSION).tar.gz - -$(SNAPPY_UNPACKED): $(SNAPPY_ARCHIVE) - tar xvfz $< -C $(TARGET) - touch $@ - -jni-header: $(SRC)/org/xerial/snappy/SnappyNative.h - - -$(SRC)/org/xerial/snappy/SnappyNative.h: $(SRC)/org/xerial/snappy/SnappyNative.java - $(JAVAH) -classpath $(TARGET)/classes -o $@ org.xerial.snappy.SnappyNative - -$(SNAPPY_SRC): $(SNAPPY_UNPACKED) - -$(SNAPPY_OUT)/%.o : $(SNAPPY_SRC_DIR)/%.cc - @mkdir -p $(@D) - $(CXX) $(CXXFLAGS) -c $< -o $@ - -$(SNAPPY_OUT)/SnappyNative.o : $(SRC)/org/xerial/snappy/SnappyNative.cpp $(SRC)/org/xerial/snappy/SnappyNative.h - @mkdir -p $(@D) - $(CXX) $(CXXFLAGS) -c $< -o $@ - - -$(SNAPPY_OUT)/$(LIBNAME): $(SNAPPY_OBJ) - $(CXX) $(CXXFLAGS) $(LINKFLAGS) $+ -o $@ - $(STRIP) $@ - -clean-native: - rm -rf $(SNAPPY_OUT) - -clean: - rm -rf $(TARGET) - -NATIVE_DIR:=src/main/resources/org/xerial/snappy/native/$(OS_NAME)/$(OS_ARCH) -NATIVE_TARGET_DIR:=$(TARGET)/classes/org/xerial/snappy/native/$(OS_NAME)/$(OS_ARCH) -NATIVE_DLL:=$(NATIVE_DIR)/$(LIBNAME) - -snappy-jar-version:=snappy-java-$(shell $(JAVA) -jar lib/silk-weaver.jar find 'project(artifactId, version)' pom.xml | grep snappy-java | awk '{ print $$2; }') - -native: $(SNAPPY_UNPACKED) $(NATIVE_DLL) -snappy: $(TARGET)/$(snappy-jar-version).jar - -$(NATIVE_DLL): $(SNAPPY_OUT)/$(LIBNAME) - @mkdir -p $(@D) - cp $< $@ - @mkdir -p $(NATIVE_TARGET_DIR) - cp $< $(NATIVE_TARGET_DIR)/$(LIBNAME) - - -$(TARGET)/$(snappy-jar-version).jar: native $(NATIVE_DLL) - $(MVN) package -Dmaven.test.skip=true - -test: $(NATIVE_DLL) - $(MVN) test - -win32: - $(MAKE) native CXX=mingw32-g++ OS_NAME=Windows OS_ARCH=x86 - -mac32: - $(MAKE) native CXX=g++ OS_NAME=Mac OS_ARCH=i386 + +include Makefile.common + +MVN:=mvn + +all: snappy + +SNAPPY_OUT:=$(TARGET)/$(snappy)-$(os_arch) +SNAPPY_ARCHIVE:=$(TARGET)/snappy-$(VERSION).tar.gz +SNAPPY_CC:=snappy-sinksource.cc snappy-stubs-internal.cc snappy.cc +SNAPPY_SRC_DIR:=$(TARGET)/snappy-$(VERSION) +SNAPPY_SRC:=$(addprefix $(SNAPPY_SRC_DIR)/,$(SNAPPY_CC)) +SNAPPY_OBJ:=$(addprefix $(SNAPPY_OUT)/,$(patsubst %.cc,%.o,$(SNAPPY_CC)) SnappyNative.o) + +SNAPPY_UNPACKED:=$(TARGET)/snappy-extracted.log + +CXXFLAGS:=$(CXXFLAGS) -I$(SNAPPY_SRC_DIR) + +$(SNAPPY_ARCHIVE): + @mkdir -p $(@D) + curl -o$@ http://snappy.googlecode.com/files/snappy-$(VERSION).tar.gz + +$(SNAPPY_UNPACKED): $(SNAPPY_ARCHIVE) + tar xvfz $< -C $(TARGET) + touch $@ + +jni-header: $(SRC)/org/xerial/snappy/SnappyNative.h + + +$(SRC)/org/xerial/snappy/SnappyNative.h: $(SRC)/org/xerial/snappy/SnappyNative.java + $(JAVAH) -classpath $(TARGET)/classes -o $@ org.xerial.snappy.SnappyNative + +$(SNAPPY_SRC): $(SNAPPY_UNPACKED) + +$(SNAPPY_OUT)/%.o : $(SNAPPY_SRC_DIR)/%.cc + @mkdir -p $(@D) + $(CXX) $(CXXFLAGS) -c $< -o $@ + +$(SNAPPY_OUT)/SnappyNative.o : $(SRC)/org/xerial/snappy/SnappyNative.cpp $(SRC)/org/xerial/snappy/SnappyNative.h + @mkdir -p $(@D) + $(CXX) $(CXXFLAGS) -c $< -o $@ + + +$(SNAPPY_OUT)/$(LIBNAME): $(SNAPPY_OBJ) + $(CXX) $(CXXFLAGS) $(LINKFLAGS) $+ -o $@ + $(STRIP) $@ + +clean-native: + rm -rf $(SNAPPY_OUT) + +clean: + rm -rf $(TARGET) + +NATIVE_DIR:=src/main/resources/org/xerial/snappy/native/$(OS_NAME)/$(OS_ARCH) +NATIVE_TARGET_DIR:=$(TARGET)/classes/org/xerial/snappy/native/$(OS_NAME)/$(OS_ARCH) +NATIVE_DLL:=$(NATIVE_DIR)/$(LIBNAME) + +snappy-jar-version:=snappy-java-$(shell $(JAVA) -jar lib/silk-weaver.jar find 'project(artifactId, version)' pom.xml | grep snappy-java | awk '{ print $$2; }') + +native: $(SNAPPY_UNPACKED) $(NATIVE_DLL) +snappy: $(TARGET)/$(snappy-jar-version).jar + +$(NATIVE_DLL): $(SNAPPY_OUT)/$(LIBNAME) + @mkdir -p $(@D) + cp $< $@ + @mkdir -p $(NATIVE_TARGET_DIR) + cp $< $(NATIVE_TARGET_DIR)/$(LIBNAME) + + +$(TARGET)/$(snappy-jar-version).jar: native $(NATIVE_DLL) + $(MVN) package -Dmaven.test.skip=true + +test: $(NATIVE_DLL) + $(MVN) test + +win32: + $(MAKE) native CXX=mingw32-g++ OS_NAME=Windows OS_ARCH=x86 + +mac32: + $(MAKE) native CXX=g++ OS_NAME=Mac OS_ARCH=i386 diff --git a/src/main/resources/org/xerial/snappy/native/Linux/amd64/libsnappy.so b/src/main/resources/org/xerial/snappy/native/Linux/amd64/libsnappy.so index 8d8f2e58af43c5ab284b8c815d921b7ad0c56f01..7182753eaab99b162b43ceda6609a1539ac02934 100755 GIT binary patch delta 4779 zcmZ{o3tUuH9>>p}2MhxP0|EmGGJwb^3WM@cYt~UiE~bKjY2vQnTk?S}Wx8!V%y!3- z96f3!_-r#@C3V~Vh?zkm=2|YArqyne>B?QTaCejPHT(acb8ua1|DVsD-}(N}4q0SmoMRev8jX}3#_$#BUNXZ&a|Foi6!3JoJ5QElDtihXtiPRkLBn5*L zP8diP?WG?dhuy|bJPuDDJo)gT;oz{VlWDcyVk&_Y8cxm}`nrBu=*dI+y7Z!oBHfX1 zpBX&Lc;lO^`NOH*Cv?H7rtNDNHqM*h@Y}+-KVLE>y6D81Y}+rkFMscw_0Qe<-P1{3 z7q-<^oj8AXe)SLUw?5naeG+jl8=Zabdi}xUcjw-GWwWiI^zi;(H!j&yg7bbfE{P~f zYe?AhWZr;^DHTP#{?uuU?`W=Tti2id+Tg!s!4yaPXo(-O*_1Or;ga-6s`{qtcLxw+ z#p$PZgIzjIOAQuj2VHJBFE!JNejiAuX|ORzx(vS-T5hx(1N;dIA^xPZfbKP>MCRkB z0Nc!ks2ZN#MsFH(B0WR6dnS0%J{7qQbfUkdG=CuX25}+bpdloHL~IofA+f%^O_IqS z_hFsT-ZOH4zSvy#+)XZv@@@2le`=(C5O+I7?i#7Phrt1sTxT|SuMxRPFdaBN^Ap_h zuJFGHivAMOXPxkOL0{0{K$iqqBCRRh?F%u`O7(=qLvB0W0lDp>ZZDom?n5q{N_rY{ zJw0-(#VD$%WU`d*5OdN!S8GJvCfti)yTlAH7R%FK$o-k3CuM*b%PyjHx3k5syAP!h zrCdb8Gl@1&%vF=96~Ntae0VKqkJk2!_4SB3w~F$`qPLy&rpZ$25mACgu1iZu95E56 z@W%`PJm?$FUYl5pwZgwpth)!V9kA{-N)XYlB05YjGouM_r<-0+vlaOf{9(3ER45k} zx);VG0-7N5;!D)&c;?7Z%MI)a7-rAQ5QWRNAKK}=D1XS60- z7St!IQ(TZGqHdtr3;C(^P*A^#En->n#TBz(6tfF|TON0GPhmSCcBx!M>mErKG>cPM zPSeb(an>Ho^|9D2R&mpROXr)DqHH!1Ovqia3CJL2uQ|vVJg%(tnbPSCN*B$Yo;Rax z_RI=u?%khmkBX#sqbB}ru7kRJkE5Z{lj+Ic0sVebfBN9u+@Cn9GdhDdMEh7D3iN*q zDh<(RrG-BR@VAf^I{tLje3&XN=?!a-CPDi5A|KgR*&h~PPm6L!>D)+u@CEmpS@Ea8CgcR~TjH0%C z!4h{O<2hE_7;i>~-V?Qn@p@!9Lqu(0yc!uVD0MsI8f4sms)z9kWFO=zinNmN1@y4AV)}e8y9e;fxT~$+!R+_7YL;jK?CwWE0iOcoZ^Dq-th7961n~ z09Sew2crY8B(?KCcoGL7;|GP>&Nv_y=+XatY&0$dSnTjK4s}bFVrXpFzf3Q?)bxGjcSt zmGOtjG00}dhmiXqllu_goA?eoV$sog4|y-L6}g@9PUJY`HpZKgrRYdPM>*p%WE*k`;~B{Pk@Fc(MIM0cWL$upjBIB- z78&mw)yjAj@*re0TnTaL6mK8)UbB&;~1!S2a~=ylwKz7Q<0bw@s>Y422p* zc3l}+RQU7^d8NY!Wl2SV>~?f*w33eDFtKv2exJum#?>a)gUIeM6CIiy8*u~jM|wkB zz;OwZ@~|(KUTM{z+DI2Cheb_>lGtoTJj8cX$cFgga;;+o-I|SwX+EYz;yol*YuMb>Qnfp+&@ppb&EDiDtW!D`soQ_5aFS{-lt5zrsT|2$*p|1T*{Z}FX z;re@Si~8-DsI@v8+1RfeItXhpYzH>zcC1FJ&8Sn}86;_9x3VZusQm|w8dklQ6)Hoi z&8Sk&q-N=)1Zqql6d2=%EAfR#;XJ@{`_k<63DT={L;AqL4XZJu1y_8f<9X#&db9z) z?yo(X9+**sIjz|AN=K|R$nl|8a?noaZE2KpZDgTFb7}>3J~lvedxf&#u?)TRl(IAT zyd+U&#pB^xsa{z(AzVkV7EZGaI}c6FEb5ytyS^Idx|&;C6h=D!aE?wb8m$TXjBYCm zH+G%#defS&y%7{k*A}=e>7Vf$C9Fmlud(ecO)Xrk`RXj)Uf4%-(QHNAc z?=7;y`>o&NeNvrrX7O8osVB4H9939g4QE`0iKum)%z;xm=YZD>=gCyX5SC^O9D^#y zu^f6}d0k~36oCQv<`Tvwh>IT=Eth*^SjjFfH@RHna)rx9E}wJxl*=bvj&o^7QLn_&bln*k#uf2H7+7*lZP-RuwyENv z>>f|#M-1Sqp~ZFg`~NE*16^i;vLI+j$V(U~W+tTNRbN)vH`VN#|JL^Q}bbiu@hfiU}n1#e|VQP3cn@M@Usl<rN$!@G~-Nk>X8W{P59;p^W{REvGmZ96seu6M`AU)KGgWZEydm>O9TFnZ(Oij zLVfU!3l=W4pU})?Woh#*4Yps_l48{L;l-e-oh_L(;+UCswAhVK{NMnCaPh}7{knV6 zL`#ol8M}LIv(cT$GL23#0H=*!LKK0V$uzz-)7bqdI}B?EVE12g&aHH3Yo_0S|E=_O fYnI=IJv{0K8h1R)7?$f&kPL1Yd~QDK?Zbq3j^{o>0wA?RNtFmcf$(PX;_r z_C6gM^%&$P!Gp=nh14*ER1_-&^@~NN; z8P%-_suIq4wnmp3I_|!*Q`te?!t`n2)ZXXnMSirmtqOXCA{B#4|yRZay&Q(D8+z#M}dLWmV&gP7fDr*l}X(Lzhu)5f#3 zmQ@BFrOR1_X*_)nel4udWH+S;6B0>+Nlz8qZOV@A!?OZuD;J_lJY2`Fn#RZ4M{@g7 za4~%%q7|$%*ize<$=z@+BpNi5gpdQx!Vr=e$lGiw;Kp4e*KH>5_u*ngdW{SDN|di- zCxdfhd$PFg5YhFte}oYsmNMVN++HuD-C}xeHQd-I{6nBPZ6aFhKXTV$Ea+FTH6YN;*xBd^rIR_jH- z&T{U*DOPw1ptd~&*0woF^o55M(hM%-Qyn2mB$SxhM(D*U#t zMN5{l+Z=AvJu-3(>ll*CTH+E}bV4K>K4jEAuWU%1@NBF+KHLap%gV6A@*yc;M6o+V zD%qZR(=P)%;|Dlmla;34X)tZE62C13e!~-s zA&0yOdr^IUNHz%>Z;9HY@y%C(Ve~|8*Z6y6IPXMl)A$=?e3_^%8uudOfmXd5pF<8n zb|E*|PN4xukf?Q9fe(>!rm9opW5}?aM6J;HJ!Ci^L@n0%U1T_hM73+Y8yOc)wQAgo z9Exn#cq?)kG68Pz+cu#Qjz-^IaBMFk<2Qlo(|9d1o>;X<<5kF!$n6?GiHs*#ZPR!O z@?hi^jprdpA$v8Rg&d9Sx(ogLZBx;(pi!q4n1CFE?9_M+ax8L%#-ow(_Nv7i=ON?A zh-%k3134bqs&O)M0A&-yjc1Zqc|G*@o=Z_#AQyva3NePN9MKSFO|dL*z7Mr^d&S(~&DQeh)bV zxme?Ok@0Py+BM#doP})FxD^@SqN-Wrt;qNqROb*dyqlKr{>9xju)UTsSlBx9Md6kaWpKf>@fsyw33M)+ifp2)D*Rp zZOKfGnFR3?|KLtA#z0mcb?(WpyA0Wz*+-dCar>bpHd~(z{a<1bhW?{vkK=WAH`CV8 zflgz)S#}2=_doGv#FGL7YPgb ze!^a(&Tr5PeTd>I@F{urB0X(nOY%pAJ<|lQ#OEG_`vBVw-?;gc=?(Tnepc8IFJhn* zcf8T@g_2zmZ=|iP+>syl%36$cVbhI{2F2qzrlZZQqU0uRRm#UyNmBM|*79(MG;6i; zkB18k^zVu^;Vh;9QO=b|>*#Ie>f~rWyI!^2GW;ww@o4pMr|kY>qWgN8r#gyU+;E09 zR43hQ|MyWIb*66znI0$9Nq94+<0S`;S(;XZ}B zG=#0e?=hFdCbRHW+Zxu4*CxE0%TrvIaaqjeQ7&`2Oy^R`rJPGCmxs8F;xdxU2rj8y zl2FtOaBj3)r=+jG5I}FSh_&$#~D z6kpt=H1||#?&nZAp@1cA*f)4#zLk_g=M&utb07;7t;uKVhP9DNc|fD4r-iR`z|u@? zvb8JEc&F3QMd-UrV4|UO^OW-&t98v0@Pg?Scwap?-a zWAAJoM;Ealw?1DS3%=C4YyOEkSFR#6gVgc zr5YaT5bZERZe<}mM2DBk#!zdly>Bs3~Fn*&UApF(%4lwMOV?J`RAit@vrJ{=2b zvj$}a5R$gT@4v$4whh_TrdP7sz6xgcgHC2XY&3br-vVtpO7h`1=@|U1!~|QVrJ@0h zpQV_Dz~9Q8@q-A{fo5hpGFiGD!e$+r9O=Y=#32Q8A-b`0LhoZlDi5`{eNh~tmXms|NZ4_ pX02U?K|lW=(fO{Tpq0CL)s-x%yU4U}Kc{{B+49b4Wo37d^k4K9QyTyP