wbtiger
/
foundationdb
mirror of https://github.com/apple/foundationdb.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove vendored argparse installation references

This commit is contained in:
Chris Donati 2019-09-17 18:42:36 -07:00
parent 102eebe654
commit 8b97bf2b2c
7 changed files with 3 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ACKNOWLEDGEMENTS
View File

@ -27,11 +27,6 @@ Mark Adler, Robert Važan (CRC-32C [Castagnoli] for C++ and .NET)
3. This notice may not be removed or altered from any source distribution.
Steven J. Bethard (argparse.py from https://code.google.com/p/argparse/)
argparse is licensed under the Python license, see:
https://code.google.com/p/argparse/source/browse/LICENSE.txt and
https://code.google.com/p/argparse/source/browse/doc/source/Python-License.txt
Russ Cox (asm.S from libcoroutine)
This software was developed as part of a project at MIT.

6
cmake/InstallLayout.cmake
View File

@ -406,15 +406,9 @@ if(NOT WIN32)
fdb_install(FILES ${CMAKE_SOURCE_DIR}/packaging/foundationdb.conf
DESTINATION etc
COMPONENT server)
install(FILES ${CMAKE_SOURCE_DIR}/packaging/argparse.py
DESTINATION "usr/lib/foundationdb"
COMPONENT server-el6)
install(FILES ${CMAKE_SOURCE_DIR}/packaging/make_public.py
DESTINATION "usr/lib/foundationdb"
COMPONENT server-el6)
install(FILES ${CMAKE_SOURCE_DIR}/packaging/argparse.py
DESTINATION "usr/lib/foundationdb"
COMPONENT server-deb)
install(FILES ${CMAKE_SOURCE_DIR}/packaging/make_public.py
DESTINATION "usr/lib/foundationdb"
COMPONENT server-deb)

2
packaging/deb/DEBIAN-foundationdb-server/preinst
View File

@ -12,7 +12,7 @@
if [ "$1" = upgrade ]; then
invoke-rc.d foundationdb stop || :
# old versions could leave this behind
rm -f /usr/lib/foundationdb/argparse.pyc
rm -f /usr/lib/foundationdb/argparse.py /usr/lib/foundationdb/argparse.pyc
fi
if dpkg-query -s foundationdb >/dev/null 2>&1 ; then

1
packaging/deb/builddebs.sh
View File

@ -23,7 +23,6 @@ install -m 0755 packaging/deb/foundationdb-init $SERVERDIR/etc/init.d/foundation
install -m 0755 bin/fdbserver $SERVERDIR/usr/sbin
install -m 0755 bin/fdbmonitor $SERVERDIR/usr/lib/foundationdb
install -m 0755 packaging/make_public.py $SERVERDIR/usr/lib/foundationdb
install -m 0644 packaging/argparse.py $SERVERDIR/usr/lib/foundationdb
dos2unix -q -n README.md $SERVERDIR/usr/share/doc/foundationdb-server/README
chmod 0644 $SERVERDIR/usr/share/doc/foundationdb-server/README

1
packaging/rpm/buildrpms.sh
View File

@ -39,7 +39,6 @@ dos2unix -q -n README.md $INSTDIR/usr/share/doc/foundationdb-server/README
chmod 0644 $INSTDIR/usr/share/doc/foundationdb-clients/README
chmod 0644 $INSTDIR/usr/share/doc/foundationdb-server/README
install -m 0755 bin/fdbbackup $INSTDIR/usr/lib/foundationdb/backup_agent/backup_agent
install -m 0644 packaging/argparse.py $INSTDIR/usr/lib/foundationdb
install -m 0755 packaging/make_public.py $INSTDIR/usr/lib/foundationdb
ln -s ../lib/foundationdb/backup_agent/backup_agent $INSTDIR/usr/bin/fdbbackup

4
packaging/rpm/foundationdb.spec.in
View File

@ -42,7 +42,6 @@ rm -rf %{buildroot}
mkdir -p %{buildroot}
tar -xzf %{_sourcedir}/install-files.tar.gz -C %{buildroot}
ifdef(`RHEL6', `rm -r %{buildroot}/lib/systemd', `rm -r %{buildroot}/etc/rc.d')
ifdef(`RHEL6', `', `rm %{buildroot}/usr/lib/foundationdb/argparse.py')
%pre server
# This should be ensured by the foundationdb-clients package, but it can't hurt...
@ -51,7 +50,7 @@ getent passwd foundationdb >/dev/null || useradd -c "FoundationDB" -g foundation
if [ $1 -gt 1 ]; then
# old versions could leave this behind
rm -f /usr/lib/foundationdb/argparse.pyc
rm -f /usr/lib/foundationdb/argparse.py /usr/lib/foundationdb/argparse.pyc
fi
CURRENTVER=$(rpm -q --queryformat %%{VERSION} foundationdb-server) || :
@ -119,7 +118,6 @@ exit 0
ifdef(`RHEL6', `/etc/rc.d/init.d/foundationdb', `/lib/systemd/system/foundationdb.service')
/usr/sbin/*
/usr/lib/foundationdb/fdbmonitor
ifdef(`RHEL6', `/usr/lib/foundationdb/argparse.py')
/usr/lib/foundationdb/make_public.py
%files clients

2
packaging/rpm/scripts/preserver.sh
View File

@ -4,7 +4,7 @@ getent passwd foundationdb >/dev/null || useradd -c "FoundationDB" -g foundation
if [ $1 -gt 1 ]; then
# old versions could leave this behind
rm -f /usr/lib/foundationdb/argparse.pyc
rm -f /usr/lib/foundationdb/argparse.py /usr/lib/foundationdb/argparse.pyc
fi
CURRENTVER=$(rpm -q --queryformat %%{VERSION} foundationdb-server) || :