Skip to content

Commit

Permalink
Finally fixed all build-fuckup after the Make-dump
Browse files Browse the repository at this point in the history
  • Loading branch information
ozra committed Jul 10, 2019
1 parent e31a444 commit 673bb6d
Show file tree
Hide file tree
Showing 7 changed files with 14 additions and 14 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ mmap-io.s
tmp-mmap-file

build/
dist/
node_modules/

# Project / IDE-files
Expand Down
7 changes: 3 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,11 @@ It should be noted that mem-mapping is by nature potentially blocking, and _shou

# News and Updates

### 2019-07-09/C: version 1.1.4
- major "package.json"-fuckups. Unless running build manually, the js-files where never packaged, nor built. Now whitelisted in package.json.

### 2019-07-09/B: version 1.1.3
### 2019-07-09/B: version 1.1.3, ..., 1.1.6
- rewritten the C++-code to catch up with V8/Nan breaking changes for node.js 12.*, which also removes all warnings in earlier versions.
- refactored in to wrapper functions for extracting values, so should new breaking changes come in later versions, it will be quicker to adjust.
- major "package.json"-fuckups. Unless running build manually, the js-files where never packaged, nor built. Now whitelisted in package.json.
- major fuckup 2: when they finally where packaged, they we're killed off when the C++ module was rebuilt on installment. So. Finally: js-files are now built to "dist", and the binary into "build". This way the TypeScript and LiveScript aren't required for end user

### 2019-07-09/A: version 1.1.1
- when replacing GNU Make, for some reason I used `yarn` in "package.json" — which may have failed builds for those not having it installed (and then not building "es-release"), and completely missing the point of getting rid of Make
Expand Down
2 changes: 1 addition & 1 deletion mmap-io.js
Original file line number Diff line number Diff line change
@@ -1 +1 @@
module.exports = require("./build/es-release/mmap-io")
module.exports = require("./dist/mmap-io")
12 changes: 6 additions & 6 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "mmap-io",
"version": "1.1.4",
"version": "1.1.7",
"license": "MIT",
"author": {
"name": "Oscar Campbell",
Expand Down Expand Up @@ -31,7 +31,7 @@
"files": [
"binding.gyp",
"LICENSE",
"build/es-release",
"dist",
"mmap-io.d.ts",
"mmap-io.js",
"package.json",
Expand All @@ -40,13 +40,13 @@
"src"
],
"scripts": {
"clean": "rm -rf build ./build/es-release/mmap-io.d.ts",
"clean": "rm -rf build dist",
"build": "npm run build-addon && npm run build-es && npm run test",
"build-addon": "node-gyp configure && node-gyp rebuild",
"build-es": "./node_modules/typescript/bin/tsc && cp ./build/es-release/mmap-io.d.ts ./",
"prepublish": "npm run build",
"build-es": "./node_modules/typescript/bin/tsc && cp ./dist/mmap-io.d.ts ./",
"prepare": "npm run build",
"install": "npm run build-addon",
"test": "./node_modules/livescript/bin/lsc -o ./build/es-release/ -b -c ./src/test.ls && ((which nodejs && nodejs ./build/es-release/test.js) || node ./build/es-release/test.js)",
"test": "./node_modules/livescript/bin/lsc -o ./dist/ -b -c ./src/test.ls && ((which nodejs && nodejs ./dist/test.js) || node ./dist/test.js)",
"watch": "while true; do (npm run build; inotifywait -qre close_write,moved_to --exclude '\\.git' ./src/; ) done;"
},
"devDependencies": {
Expand Down
2 changes: 1 addition & 1 deletion src/mmap-io.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
const mmap_lib_raw_ = require("../../build/Release/mmap-io")
const mmap_lib_raw_ = require("../build/Release/mmap-io")

type FileDescriptor = number

Expand Down
2 changes: 1 addition & 1 deletion src/test.ls
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

fs = require "fs"
os = require "os"
mmap = require "../../"
mmap = require "../"
assert = require "assert"
constants = require "constants"

Expand Down
2 changes: 1 addition & 1 deletion tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
// "declarationMap": true, /* Generates a sourcemap for each corresponding '.d.ts' file. */
// "sourceMap": true, /* Generates corresponding '.map' file. */
// "outFile": "./", /* Concatenate and emit output to single file. */
"outDir": "./build/es-release/", /* Redirect output structure to the directory. */
"outDir": "./dist/", /* Redirect output structure to the directory. */
"rootDir": "./src/", /* Specify the root directory of input files. Use to control the output directory structure with --outDir. */
// "composite": true, /* Enable project compilation */
// "removeComments": true, /* Do not emit comments to output. */
Expand Down

0 comments on commit 673bb6d

Please sign in to comment.