Skip to content

Commit d95416f

Browse files
committed
Clean C-extension directories before importing
* So we don't keep extra files.
1 parent b7eecc1 commit d95416f

File tree

2 files changed

+14
-32
lines changed

2 files changed

+14
-32
lines changed

src/main/c/psych/yaml/LICENSE

Lines changed: 0 additions & 19 deletions
This file was deleted.

tool/import-mri-files.sh

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -28,31 +28,32 @@ find lib/mri -name '.document' -delete
2828
# *.c
2929
cp ../ruby/st.c src/main/c/cext/st.c
3030

31-
# ext/, sorted alphabetically
31+
# Copy Ruby files in ext/, sorted alphabetically
3232
cp -r ../ruby/ext/bigdecimal/lib/bigdecimal lib/mri
3333

34-
cp ../ruby/ext/etc/*.{c,rb} src/main/c/etc
35-
3634
cp ../ruby/ext/nkf/lib/*.rb lib/mri
37-
cp ../ruby/ext/nkf/*.{c,rb} src/main/c/nkf
38-
cp -r ../ruby/ext/nkf/nkf-utf8 src/main/c/nkf
3935

40-
rm src/main/c/openssl/*.{c,h}
41-
cp ../ruby/ext/openssl/*.{c,h,rb} src/main/c/openssl
4236
cp -r ../ruby/ext/openssl/lib/* lib/mri
4337

44-
cp ../ruby/ext/psych/*.{c,h,rb} src/main/c/psych
45-
cp ../ruby/ext/psych/yaml/*.{c,h} src/main/c/psych/yaml
38+
cp ../ruby/ext/pty/lib/*.rb lib/mri
39+
4640
cp ../ruby/ext/psych/lib/psych.rb lib/mri
4741
cp -r ../ruby/ext/psych/lib/psych lib/mri
4842

49-
cp ../ruby/ext/pty/lib/*.rb lib/mri
43+
cp -r ../ruby/ext/syslog/lib/syslog lib/mri/syslog
5044

51-
cp ../ruby/ext/rbconfig/sizeof/*.{c,rb} src/main/c/rbconfig-sizeof
45+
# Copy C extensions in ext/, sorted alphabetically
46+
rm -r src/main/c/{etc,nkf,openssl,psych,rbconfig-sizeof,syslog,zlib}
47+
mkdir src/main/c/{etc,nkf,openssl,psych,rbconfig-sizeof,syslog,zlib}
5248

49+
cp ../ruby/ext/etc/*.{c,rb} src/main/c/etc
50+
cp ../ruby/ext/nkf/*.{c,rb} src/main/c/nkf
51+
cp -r ../ruby/ext/nkf/nkf-utf8 src/main/c/nkf
52+
cp ../ruby/ext/openssl/*.{c,h,rb} src/main/c/openssl
53+
cp ../ruby/ext/psych/*.{c,h,rb} src/main/c/psych
54+
cp -r ../ruby/ext/psych/yaml src/main/c/psych
55+
cp ../ruby/ext/rbconfig/sizeof/*.{c,rb} src/main/c/rbconfig-sizeof
5356
cp ../ruby/ext/syslog/*.{c,rb} src/main/c/syslog
54-
cp -r ../ruby/ext/syslog/lib/syslog lib/mri/syslog
55-
5657
cp ../ruby/ext/zlib/*.{c,rb} src/main/c/zlib
5758

5859
# test/

0 commit comments

Comments
 (0)