Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 39 additions & 0 deletions .devcontainer.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
// For format details, see https://aka.ms/devcontainer.json. For config options, see the
// README at: https://github.com/devcontainers/templates/tree/main/src/ubuntu
{
"name": "Ubuntu",
// Or use a Dockerfile or Docker Compose file. More info: https://containers.dev/guide/dockerfile
"image": "mcr.microsoft.com/devcontainers/base:ubuntu",

// Features to add to the dev container. More info: https://containers.dev/features.
"features": {
"ghcr.io/rocker-org/devcontainer-features/miniforge:2": {}
},

// Use 'forwardPorts' to make a list of ports inside the container available locally.
// "forwardPorts": [],

// Use 'postCreateCommand' to run commands after the container is created.
"postCreateCommand": "mamba env create -y -n hipstr -f dev-env.yml",

// Configure tool-specific properties.
"customizations": {
"vscode": {
"extensions": [
"ms-python.python",
"ms-vscode.live-server",
"GitHub.vscode-github-actions"
],
"settings": {
"terminal.integrated.hideOnStartup": "always",
"files.eol": "\n",
"git.autofetch": true,
"git.enableSmartCommit": true,
"git.confirmSync": false
}
}
}

// Uncomment to connect as root instead. More info: https://aka.ms/dev-containers-non-root.
// "remoteUser": "root"
}
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
*.o
lib/cephes/libprob.a
src/version.cpp
12 changes: 12 additions & 0 deletions dev-env.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
channels:
- conda-forge
- bioconda
- nodefaults
dependencies:
- conda-forge::xz
- bioconda::htslib
- conda-forge::zlib
- conda-forge::bzip2
- conda-forge::hcephes
- conda-forge::gxx_linux-64
- conda-forge::gcc_linux-64
2 changes: 1 addition & 1 deletion recipes/hipstr2/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,11 @@ source:
sha256: {{ sha }}
patches:
- patches/0001-use-version-from-config.patch
- patches/0002-include-cstdint-in-region.patch
build:
number: 0
run_exports:
- {{ pin_subpackage('hipstr2', max_pin="x.x") }}
skip: true # [win]
script:
- mkdir -p "${PREFIX}/bin"
- make version
Expand Down
2 changes: 1 addition & 1 deletion recipes/hipstr2/patches/0001-use-version-from-config.patch
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ index 0f7ea29..84f774a 100644
## Override with:
## make CXXFLAGS=XXXXX
-CXXFLAGS= -O3 -g -D__STDC_LIMIT_MACROS -D_FILE_OFFSET_BITS=64 -std=c++0x -DMACOSX -pthread #-pedantic -Wunreachable-code -Weverything
+CXXFLAGS=$(CPPFLAGS) -O3 -g -D__STDC_LIMIT_MACROS -D_FILE_OFFSET_BITS=64 -std=c++0x -DMACOSX -pthread #-pedantic -Wunreachable-code -Weverything
+CXXFLAGS=$(CPPFLAGS) -O3 -g -D__STDC_LIMIT_MACROS -D_FILE_OFFSET_BITS=64 -std=c++0x -pthread #-pedantic -Wunreachable-code -Weverything

## To create a static distribution file, run:
## make static-dist
Expand Down
23 changes: 0 additions & 23 deletions recipes/hipstr2/patches/0002-include-cstdint-in-region.patch

This file was deleted.

1 change: 1 addition & 0 deletions src/region.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
#include <string>
#include <vector>
#include <stdlib.h>
#include <cstdint>

#include "error.h"
#include "region.h"
Expand Down
1 change: 1 addition & 0 deletions src/region.h
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
#include <string>
#include <vector>
#include <stdlib.h>
#include <cstdint>

#include "error.h"

Expand Down
Loading