This is an archive of the discontinued Mercurial Phabricator instance.

Differential D1412

setup: build treedirstate and rusttreedirstate packages
ClosedPublic

Authored by mbthomas on Nov 14 2017, 12:40 PM.
Tags
None
Subscribers
durham

Details

Reviewers
quark
Group Reviewers
Restricted Project
Commits
rFBHGX2742730d0d39: setup: build treedirstate and rusttreedirstate packages
Summary

The treedirstate and rusttreedirstate packages are only built if a suitable
version of Cargo is available.

Diff Detail

Repository
rFBHGX Facebook Mercurial Extensions
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

mbthomas created this revision.Nov 14 2017, 12:40 PM
Herald added a reviewer: Restricted Project. · View Herald TranscriptNov 14 2017, 12:40 PM
quark accepted this revision.Nov 19 2017, 11:43 PM
This revision is now accepted and ready to land.Nov 19 2017, 11:43 PM
quark added inline comments.Nov 20 2017, 8:01 PM
setup.py
33

Maybe this should be a hard error so people won't accidentally miss dependencies.

mbthomas added inline comments.Nov 21 2017, 6:52 AM
setup.py
33

I don't want to break users who simply don't have a rust toolchain installed from using the rest of fb-hgext. If USERUST is 1 then it's a hard failure, but if USERUST is not set then you just don't get rust-based code if you don't have a rust toolchain.

We can change this later once rust toolchains are more commonplace and necessary.

durham added a subscriber: durham.Nov 21 2017, 12:15 PM
durham added inline comments.
setup.py
33

We could at least print a warning to stderr, so it's more debugable in build outputs.

mbthomas updated this revision to Diff 3737.Nov 21 2017, 1:36 PM
mbthomas updated this revision to Diff 3778.Nov 22 2017, 1:15 PM
mbthomas updated this revision to Diff 3833.Nov 24 2017, 11:53 AM
mbthomas updated this revision to Diff 3872.Nov 27 2017, 8:00 AM
mbthomas updated this revision to Diff 3890.Nov 27 2017, 4:33 PM
Closed by commit rFBHGX2742730d0d39: setup: build treedirstate and rusttreedirstate packages (authored by mbthomas). · Explain WhyNov 28 2017, 6:03 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Diff 3492

.cargo/config

  • This file was moved from rust/treedirstate/.cargo/config.

Makefile

@echo ' install - install program and man pages to PREFIX ($(PREFIX))' @echo ' install - install program and man pages to PREFIX ($(PREFIX))'
@echo ' clean - remove files created by other targets' @echo ' clean - remove files created by other targets'
@echo ' (except installed files or dist source tarball)' @echo ' (except installed files or dist source tarball)'
local: local:
$(PYTHON) setup.py \ $(PYTHON) setup.py \
build_py -c -d . \ build_py -c -d . \
build_clib \ build_clib \
build_ext -i build_ext -i \
build_rust_ext -i
install: install:
$(PYTHON) setup.py $(PURE) install --prefix="$(PREFIX)" --force $(PYTHON) setup.py $(PURE) install --prefix="$(PREFIX)" --force
clean: clean:
-$(PYTHON) setup.py clean --all clean_ext # ignore errors from this command -$(PYTHON) setup.py clean --all clean_ext # ignore errors from this command
deb: deb:
contrib/builddeb contrib/builddeb

rust/treedirstate/.cargo/config

  • This file was moved to .cargo/config.

setup.py

from distutils.version import LooseVersion from distutils.version import LooseVersion
from distutils.cmd import Command from distutils.cmd import Command
from distutils.core import setup, Extension from distutils.core import setup, Extension
import distutils import distutils
from distutils_rust import RustExtension, BuildRustExt
import fnmatch import fnmatch
from glob import glob from glob import glob
import os, shutil, sys import os, shutil, sys
iswindows = os.name == 'nt' iswindows = os.name == 'nt'
WERROR = "/WX" if iswindows else "-Werror" WERROR = "/WX" if iswindows else "-Werror"
WSTRICTPROTOTYPES = None if iswindows else "-Werror=strict-prototypes" WSTRICTPROTOTYPES = None if iswindows else "-Werror=strict-prototypes"
WALL = "/Wall" if iswindows else "-Wall" WALL = "/Wall" if iswindows else "-Wall"
STDC99 = "" if iswindows else "-std=c99" STDC99 = "" if iswindows else "-std=c99"
STDCPP0X = "" if iswindows else "-std=c++0x" STDCPP0X = "" if iswindows else "-std=c++0x"
WEXTRA = "" if iswindows else "-Wextra" WEXTRA = "" if iswindows else "-Wextra"
WCONVERSION = "" if iswindows else "-Wconversion" WCONVERSION = "" if iswindows else "-Wconversion"
PEDANTIC = "" if iswindows else "-pedantic" PEDANTIC = "" if iswindows else "-pedantic"
SHA1LIB_DEFINE = "/DSHA1_USE_SHA1DC" if iswindows else "-DSHA1_USE_SHA1DC" SHA1LIB_DEFINE = "/DSHA1_USE_SHA1DC" if iswindows else "-DSHA1_USE_SHA1DC"
SHA1_LIBRARY = "sha1detectcoll" SHA1_LIBRARY = "sha1detectcoll"
NOOPTIMIZATION = "/Od" if iswindows else "-O0" NOOPTIMIZATION = "/Od" if iswindows else "-O0"
OPTIMIZATION = "" if iswindows else "-O2" OPTIMIZATION = "" if iswindows else "-O2"
PRODUCEDEBUGSYMBOLS = "/DEBUG:FULL" if iswindows else "-g" PRODUCEDEBUGSYMBOLS = "/DEBUG:FULL" if iswindows else "-g"
if 'USERUST' in os.environ:
USERUST = int(os.environ['USERUST'])
else:
import subprocess
try:
cargo_version = subprocess.check_output(['cargo', '--version'])
except Exception:
USERUST = False
quarkUnsubmitted
Not Done

Maybe this should be a hard error so people won't accidentally miss dependencies.

quark: Maybe this should be a hard error so people won't accidentally miss dependencies.
mbthomasAuthorUnsubmitted
Not Done

I don't want to break users who simply don't have a rust toolchain installed from using the rest of fb-hgext. If USERUST is 1 then it's a hard failure, but if USERUST is not set then you just don't get rust-based code if you don't have a rust toolchain.

We can change this later once rust toolchains are more commonplace and necessary.

mbthomas: I don't want to break users who simply don't have a rust toolchain installed from using the…
durhamUnsubmitted
Not Done

We could at least print a warning to stderr, so it's more debugable in build outputs.

durham: We could at least print a warning to stderr, so it's more debugable in build outputs.
else:
USERUST = (LooseVersion(cargo_version.split()[1]) >= LooseVersion('0.21'))
# whether to use Cython to recompile .pyx to .c/.cpp at build time. # whether to use Cython to recompile .pyx to .c/.cpp at build time.
# if False, fallback to .c/.cpp in the repo and .pyx files are ignored. # if False, fallback to .c/.cpp in the repo and .pyx files are ignored.
# if True, re-compile .c/.cpp from .pyx files, require cython at build time. # if True, re-compile .c/.cpp from .pyx files, require cython at build time.
if 'USECYTHON' in os.environ: if 'USECYTHON' in os.environ:
USECYTHON = int(os.environ['USECYTHON']) USECYTHON = int(os.environ['USECYTHON'])
else: else:
try: try:
import Cython import Cython
'linelog', 'linelog',
] ]
else: else:
availablepackages += [ availablepackages += [
'fastmanifest', 'fastmanifest',
'treemanifest', 'treemanifest',
'linelog', 'linelog',
] ]
if USERUST:
availablepackages += [
'treedirstate',
]
def distutils_dir_name(dname): def distutils_dir_name(dname):
"""Returns the name of a distutils build directory""" """Returns the name of a distutils build directory"""
f = "{dirname}.{platform}-{version}" f = "{dirname}.{platform}-{version}"
return f.format(dirname=dname, return f.format(dirname=dname,
platform=distutils.util.get_platform(), platform=distutils.util.get_platform(),
version=sys.version[:3]) version=sys.version[:3])
self.announce(summary, level=distutils.log.INFO) self.announce(summary, level=distutils.log.INFO)
def _rglob(self, patten): def _rglob(self, patten):
# recursive glob # recursive glob
for dirname, dirs, files in os.walk('.'): for dirname, dirs, files in os.walk('.'):
for name in fnmatch.filter(files, patten): for name in fnmatch.filter(files, patten):
yield os.path.join(dirname, name) yield os.path.join(dirname, name)
rust_ext_modules = []
if USERUST:
rust_ext_modules.extend([
RustExtension('rusttreedirstate',
package='treedirstate',
manifest='rust/treedirstate/Cargo.toml',
),
])
setup( setup(
name='fbhgext', name='fbhgext',
version='1.0', version='1.0',
author='Facebook Source Control Team', author='Facebook Source Control Team',
maintainer='Facebook Source Control Team', maintainer='Facebook Source Control Team',
maintainer_email='sourcecontrol-dev@fb.com', maintainer_email='sourcecontrol-dev@fb.com',
url='https://bitbucket.org/facebook/hg-experimental/', url='https://bitbucket.org/facebook/hg-experimental/',
description='Facebook mercurial extensions', description='Facebook mercurial extensions',
long_description="", long_description="",
keywords='facebook fb hg mercurial shallow remote filelog', keywords='facebook fb hg mercurial shallow remote filelog',
license='GPLv2+', license='GPLv2+',
packages=packages, packages=packages,
install_requires=requires, install_requires=requires,
py_modules=py_modules, py_modules=py_modules,
ext_modules = ext_modules, ext_modules=ext_modules,
libraries=libraries, libraries=libraries,
rust_ext_modules=rust_ext_modules,
cmdclass={ cmdclass={
'clean_ext': CleanExtCommand, 'clean_ext': CleanExtCommand,
'build_rust_ext': BuildRustExt,
} }
) )

treedirstate/Makefile

  • This file was deleted.
NAME := rusttreedirstate
# Cargo's depfiles use full paths, so we must include the full path
# to the rust library.
DIR := $(realpath $(join $(dir $(firstword $(MAKEFILE_LIST))),../rust/treedirstate))
MODE ?= release
ifeq ($(MODE),release)
CARGO_ARGS += --release
endif
ifeq ($(shell uname),Darwin)
LIBSUFFIX := .dylib
else
LIBSUFFIX := .so
endif
RUSTLIB := $(DIR)/target/$(MODE)/lib$(NAME)$(LIBSUFFIX)
RUSTDEP := $(DIR)/target/$(MODE)/lib$(NAME).d
.PHONY: all
all: $(NAME).so
$(NAME).so: $(RUSTLIB)
cp $< $@
$(RUSTLIB):
cd $(DIR) && cargo build $(CARGO_ARGS)
.PHONY: test
test:
cd $(DIR) && cargo test
.PHONY: clean
clean:
$(RM) $(NAME).so
cd $(DIR) && cargo clean
# This pattern rule for Rust source files forces a rebuild if any source file
# is deleted.
$(DIR)/src/%.rs: ;
-include $(RUSTDEP)
./setup.py