Skip to content

Commit 5d00ca6

Browse files
committed
add submodules
1 parent 7f0f94b commit 5d00ca6

File tree

9 files changed

+46
-32
lines changed

9 files changed

+46
-32
lines changed

.gitmodules

+28
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
[submodule "source/libnfc"]
2+
path = source/libnfc
3+
url = https://github.com/GSWXXN/libnfc.git
4+
branch = libnfc
5+
[submodule "source/nfc-mfdetect"]
6+
path = source/nfc-mfdetect
7+
url = https://github.com/GSWXXN/mfoc.git
8+
branch = nfc-mfdetect
9+
[submodule "source/nfc-mfdict"]
10+
path = source/nfc-mfdict
11+
url = https://github.com/GSWXXN/mfoc.git
12+
branch = nfc-mfdict
13+
[submodule "source/nfc-mflock"]
14+
path = source/nfc-mflock
15+
url = https://github.com/GSWXXN/nfc-mflock.git
16+
branch = nfc-mflock
17+
[submodule "source/cropto1_bs"]
18+
path = source/cropto1_bs
19+
url = https://github.com/GSWXXN/cropto1_bs.git
20+
branch = cropto1_bs
21+
[submodule "source/libnfc_collect"]
22+
path = source/libnfc_collect
23+
url = https://github.com/GSWXXN/crypto1_bs.git
24+
branch = libnfc_collect
25+
[submodule "source/mfoc"]
26+
path = source/mfoc
27+
url = https://github.com/GSWXXN/mfoc.git
28+
branch = master

compile.sh

+11-32
Original file line numberDiff line numberDiff line change
@@ -29,14 +29,13 @@ fi
2929

3030
workdir=$(pwd)
3131
prefix=$workdir/framework
32+
source=$workdir/source
3233
rm -rf "$prefix"
33-
rm -rf "$workdir"/work
3434
mkdir "$prefix"
35-
mkdir "$workdir"/work
3635
mkdir "$prefix"/bin
3736

3837
# libusb
39-
cd "$workdir"/work
38+
cd "$source"
4039
if [ "$os" == "Msys" ]; then
4140
echo
4241
echo
@@ -51,6 +50,8 @@ elif [ "$os" == "Darwin" ]; then
5150
echo
5251
echo
5352
echo "============================== libusb =============================="
53+
mkdir ./libusb
54+
cd ./libusb
5455
curl -LO https://pub-3d2f9df4304d45e38bbebe723816c4a3.r2.dev/libusb-legacy-0.1.12_4.darwin_22.x86_64.tbz2
5556
tar -xvf libusb-legacy-0.1.12_4.darwin_22.x86_64.tbz2
5657
mv ./opt/local/* "$prefix"/
@@ -61,10 +62,7 @@ fi
6162
echo
6263
echo
6364
echo "============================== libnfc =============================="
64-
cd "$workdir"/work
65-
curl -LO https://github.com/GSWXXN/libnfc/archive/refs/heads/libnfc.zip
66-
unzip ./libnfc.zip
67-
cd ./libnfc-libnfc
65+
cd "$source"/libnfc
6866
if [ "$os" == "Msys" ]; then
6967
CMAKE_INSTALL_PREFIX=$prefix
7068
LIBNFC_DRIVER_ACR122S=OFF
@@ -89,10 +87,7 @@ fi
8987
echo
9088
echo
9189
echo "============================== mfoc =============================="
92-
cd "$workdir"/work
93-
curl -Lo mfoc.zip https://github.com/GSWXXN/mfoc/archive/refs/heads/master.zip
94-
unzip mfoc.zip
95-
cd ./mfoc-master
90+
cd "$source"/mfoc
9691
autoreconf -vis
9792
if [ "$os" == "Msys" ]; then
9893
LIBS=$prefix/lib/libnfc.a ./configure LDFLAGS=-L"$prefix"/lib CPPFLAGS=-I"$prefix"/include PKG_CONFIG=: prefix="$prefix"
@@ -107,10 +102,7 @@ make && make install
107102
echo
108103
echo
109104
echo "============================== nfc-mfdict =============================="
110-
cd "$workdir"/work
111-
curl -LO https://github.com/GSWXXN/mfoc/archive/refs/heads/nfc-mfdict.zip
112-
unzip nfc-mfdict.zip
113-
cd ./mfoc-nfc-mfdict
105+
cd "$source"/nfc-mfdict
114106
autoreconf -vis
115107
if [ "$os" == "Msys" ]; then
116108
LIBS=$prefix/lib/libnfc.a ./configure LDFLAGS=-L"$prefix"/lib CPPFLAGS=-I"$prefix"/include PKG_CONFIG=: prefix="$prefix"
@@ -124,10 +116,7 @@ make && make install
124116
echo
125117
echo
126118
echo "============================== nfc-mfdetect =============================="
127-
cd "$workdir"/work
128-
curl -LO https://github.com/GSWXXN/mfoc/archive/refs/heads/nfc-mfdetect.zip
129-
unzip nfc-mfdetect.zip
130-
cd ./mfoc-nfc-mfdetect
119+
cd "$source"/nfc-mfdetect
131120
autoreconf -vis
132121
if [ "$os" == "Msys" ]; then
133122
LIBS=$prefix/lib/libnfc.a ./configure LDFLAGS=-L"$prefix"/lib CPPFLAGS=-I"$prefix"/include PKG_CONFIG=: prefix="$prefix"
@@ -141,10 +130,7 @@ make && make install
141130
echo
142131
echo
143132
echo "============================== nfc-mflock =============================="
144-
cd "$workdir"/work
145-
curl -LO https://github.com/GSWXXN/nfc-mflock/archive/refs/heads/nfc-mflock.zip
146-
unzip nfc-mflock.zip
147-
cd ./nfc-mflock-nfc-mflock
133+
cd "$source"/nfc-mflock
148134
autoreconf -vis
149135
./configure LDFLAGS=-L"$prefix"/lib prefix="$prefix" CPPFLAGS=-I"$prefix"/include
150136
make && make install
@@ -154,10 +140,7 @@ make && make install
154140
echo
155141
echo
156142
echo "============================== libnfc_collect =============================="
157-
cd "$workdir"/work
158-
curl -LO https://github.com/GSWXXN/crypto1_bs/archive/refs/heads/libnfc_collect.zip
159-
unzip libnfc_collect.zip
160-
cd ./crypto1_bs-libnfc_collect
143+
cd "$source"/libnfc_collect
161144
curl -LO https://pub-3d2f9df4304d45e38bbebe723816c4a3.r2.dev/craptev1-v1.1.tar.xz
162145
tar -xf craptev1-v1.1.tar.xz
163146
mkdir crapto1-v3.3
@@ -176,10 +159,7 @@ make libnfc-collect && make install
176159
echo
177160
echo
178161
echo "============================== cropto1_bs =============================="
179-
cd "$workdir"/work
180-
curl -LO https://github.com/GSWXXN/cropto1_bs/archive/refs/heads/cropto1_bs.zip
181-
unzip cropto1_bs.zip
182-
cd ./cropto1_bs-cropto1_bs
162+
cd "$source"/cropto1_bs
183163
autoreconf -vis
184164
./configure prefix="$prefix" CFLAGS=-I/opt/local/include' '-I"$prefix"/include LDFLAGS=-L"$prefix"/lib
185165
make && make install
@@ -216,7 +196,6 @@ echo "- clean up"
216196
rm -rf "$prefix"/bin2/
217197
rm -rf "$prefix"/include/
218198
rm -rf "$prefix"/share/
219-
rm -rf "$workdir"/work
220199
if [ "$os" == "Msys" ]; then
221200
rm -rf "${prefix:?}/lib/"
222201
fi

source/cropto1_bs

Submodule cropto1_bs added at c1dc9cf

source/libnfc

Submodule libnfc added at 64fbd7d

source/libnfc_collect

Submodule libnfc_collect added at c466f76

source/mfoc

Submodule mfoc added at ba072f1

source/nfc-mfdetect

Submodule nfc-mfdetect added at 7e05efa

source/nfc-mfdict

Submodule nfc-mfdict added at 8a46697

source/nfc-mflock

Submodule nfc-mflock added at 8356e90

0 commit comments

Comments
 (0)