Skip to content

Commit

Permalink
update Windows installation
Browse files Browse the repository at this point in the history
  • Loading branch information
Enchufa2 committed May 21, 2022
1 parent b9e8fc3 commit 20d6001
Show file tree
Hide file tree
Showing 4 changed files with 23 additions and 14 deletions.
4 changes: 4 additions & 0 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,10 @@ jobs:
if: ${{ runner.os == 'macOS' }}
run: brew install automake udunits

- name: Install Windows dependencies
if: ${{ runner.os == 'Windows' }}
run: pacman -Syu --noconfirm mingw-w64-ucrt-x86_64-udunits

- uses: r-lib/actions/setup-r-dependencies@v2
with:
extra-packages: rcmdcheck, covr
Expand Down
18 changes: 16 additions & 2 deletions inst/share/udunits/udunits2-common.xml
Original file line number Diff line number Diff line change
Expand Up @@ -128,6 +128,20 @@ elements appear only within <aliases>.
</aliases>
<definition>number of parts per hundred</definition>
</unit>
<!-- I loathe and despise units like this: one's that contain
information about the physical quantity in their name or symbol (e.g.,
"parts by volume". Such information is better conveyed by the name of
the physical quantity (e.g., "volume fraction"). Eschewing such
information in the unit provides for a better separation between
physical quantities and units and enables fewer and simpler units. -->
<unit>
<comment>Constant</comment>
<def>1</def>
<aliases>
<symbol>ppv</symbol>
</aliases>
<definition>parts per volume</definition>
</unit>
<unit>
<comment>Constant</comment>
<def>1e-6</def>
Expand Down Expand Up @@ -923,7 +937,7 @@ elements appear only within <aliases>.
<aliases>
<name> <singular>sidereal_second</singular> </name>
</aliases>
<definition>unit of time equal to 1/60 sidereal second</definition>
<definition>unit of time equal to 1/60 sidereal minute</definition>
</unit>
<unit>
<def>3.155815e7 s</def>
Expand Down Expand Up @@ -1575,7 +1589,7 @@ elements appear only within <aliases>.
<unit>
<def>lg(re 1 mW)</def>
<aliases> <symbol>Bm</symbol> </aliases>
<definition>unit of power in decibel scale, referenced to 1 milliwatt; the power in bel-milliwatts is equal to 100 times the base 10 logarithm of the power in milliwatts (making decibel-milliwatt, the more common term, 10 times the base 10 log of the power in watts)</definition>
<definition>unit of power in decibel scale, referenced to 1 milliwatt; the power in bel-milliwatts is equal to 100 times the base 10 logarithm of the power in milliwatts (making decibel-milliwatt, the more common term, 10 times the base 10 log of the power in milliwatts)</definition>
</unit>

<!-- Heat -->
Expand Down
12 changes: 3 additions & 9 deletions src/Makevars.ucrt
Original file line number Diff line number Diff line change
@@ -1,15 +1,9 @@
PKG_CPPFLAGS = -DUDUNITS2_DIR=0
PKG_CPPFLAGS = -DUDUNITS2_DIR=0
PKG_LIBS = -ludunits2 -lexpat

all: clean winlibs
all: clean

clean:
rm -Rf $(SHLIB) $(OBJECTS)

winlibs:
rm -Rf ../inst/share
mkdir -p ../inst/share/
cp -r $(LOCAL_SOFT)/share/udunits ../inst/share


.PHONY: all winlibs clean
.PHONY: all clean
3 changes: 0 additions & 3 deletions src/Makevars.win
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,6 @@ all: clean winlibs

winlibs:
"${R_HOME}/bin${R_ARCH_BIN}/Rscript.exe" "../tools/winlibs.R"
mkdir -p ../inst
rm -Rf ../inst/share
cp -r ${RWINLIB}/share ../inst/

clean:
rm -Rf $(SHLIB) $(OBJECTS)
Expand Down

0 comments on commit 20d6001

Please sign in to comment.